Commit c460c7d9 authored by Chad Williamson's avatar Chad Williamson Committed by Greg Kroah-Hartman

staging: silicom: remove unnecessary braces in bp_proc.c

Remove unnecessary braces from single statement blocks in bp_proc.c,
resolving checkpatch.pl warnings.
Signed-off-by: default avatarChad Williamson <chad@dahc.us>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed5054b6
...@@ -86,10 +86,9 @@ static struct proc_dir_entry *proc_getdir(char *name, ...@@ -86,10 +86,9 @@ static struct proc_dir_entry *proc_getdir(char *name,
if (pde == (struct proc_dir_entry *)0) { if (pde == (struct proc_dir_entry *)0) {
/* create the directory */ /* create the directory */
pde = create_proc_entry(name, S_IFDIR, proc_dir); pde = create_proc_entry(name, S_IFDIR, proc_dir);
if (pde == (struct proc_dir_entry *)0) { if (pde == (struct proc_dir_entry *)0)
return pde; return pde;
} }
}
return pde; return pde;
} }
...@@ -107,10 +106,8 @@ bypass_proc_create_entry_sd(struct pfs_unit *pfs_unit_curr, ...@@ -107,10 +106,8 @@ bypass_proc_create_entry_sd(struct pfs_unit *pfs_unit_curr,
S_IFREG | S_IRUSR | S_IFREG | S_IRUSR |
S_IWUSR | S_IRGRP | S_IWUSR | S_IRGRP |
S_IROTH, parent_pfs); S_IROTH, parent_pfs);
if (pfs_unit_curr->proc_entry == 0) { if (pfs_unit_curr->proc_entry == 0)
return -1; return -1;
}
pfs_unit_curr->proc_entry->read_proc = read_proc; pfs_unit_curr->proc_entry->read_proc = read_proc;
pfs_unit_curr->proc_entry->write_proc = write_proc; pfs_unit_curr->proc_entry->write_proc = write_proc;
...@@ -207,9 +204,8 @@ set_bypass_pfs(struct file *file, const char *buffer, ...@@ -207,9 +204,8 @@ set_bypass_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -239,9 +235,8 @@ set_tap_pfs(struct file *file, const char *buffer, ...@@ -239,9 +235,8 @@ set_tap_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -271,9 +266,8 @@ set_disc_pfs(struct file *file, const char *buffer, ...@@ -271,9 +266,8 @@ set_disc_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -421,9 +415,8 @@ set_bypass_wd_pfs(struct file *file, const char *buffer, ...@@ -421,9 +415,8 @@ set_bypass_wd_pfs(struct file *file, const char *buffer,
unsigned int timeout = 0; unsigned int timeout = 0;
char *timeout_ptr = kbuf; char *timeout_ptr = kbuf;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
timeout_ptr = kbuf; timeout_ptr = kbuf;
timeout = atoi(&timeout_ptr); timeout = atoi(&timeout_ptr);
...@@ -570,9 +563,8 @@ set_dis_bypass_pfs(struct file *file, const char *buffer, ...@@ -570,9 +563,8 @@ set_dis_bypass_pfs(struct file *file, const char *buffer,
int bypass_param = 0, length = 0; int bypass_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -599,9 +591,8 @@ set_dis_tap_pfs(struct file *file, const char *buffer, ...@@ -599,9 +591,8 @@ set_dis_tap_pfs(struct file *file, const char *buffer,
int tap_param = 0, length = 0; int tap_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -628,9 +619,8 @@ set_dis_disc_pfs(struct file *file, const char *buffer, ...@@ -628,9 +619,8 @@ set_dis_disc_pfs(struct file *file, const char *buffer,
int tap_param = 0, length = 0; int tap_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -717,9 +707,8 @@ set_bypass_pwup_pfs(struct file *file, const char *buffer, ...@@ -717,9 +707,8 @@ set_bypass_pwup_pfs(struct file *file, const char *buffer,
int bypass_param = 0, length = 0; int bypass_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -746,9 +735,8 @@ set_bypass_pwoff_pfs(struct file *file, const char *buffer, ...@@ -746,9 +735,8 @@ set_bypass_pwoff_pfs(struct file *file, const char *buffer,
int bypass_param = 0, length = 0; int bypass_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -775,9 +763,8 @@ set_tap_pwup_pfs(struct file *file, const char *buffer, ...@@ -775,9 +763,8 @@ set_tap_pwup_pfs(struct file *file, const char *buffer,
int tap_param = 0, length = 0; int tap_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -804,9 +791,8 @@ set_disc_pwup_pfs(struct file *file, const char *buffer, ...@@ -804,9 +791,8 @@ set_disc_pwup_pfs(struct file *file, const char *buffer,
int tap_param = 0, length = 0; int tap_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -913,9 +899,8 @@ set_std_nic_pfs(struct file *file, const char *buffer, ...@@ -913,9 +899,8 @@ set_std_nic_pfs(struct file *file, const char *buffer,
int bypass_param = 0, length = 0; int bypass_param = 0, length = 0;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -988,9 +973,8 @@ set_wd_exp_mode_pfs(struct file *file, const char *buffer, ...@@ -988,9 +973,8 @@ set_wd_exp_mode_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -1036,9 +1020,8 @@ set_wd_autoreset_pfs(struct file *file, const char *buffer, ...@@ -1036,9 +1020,8 @@ set_wd_autoreset_pfs(struct file *file, const char *buffer,
u32 timeout = 0; u32 timeout = 0;
char *timeout_ptr = kbuf; char *timeout_ptr = kbuf;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
timeout_ptr = kbuf; timeout_ptr = kbuf;
timeout = atoi(&timeout_ptr); timeout = atoi(&timeout_ptr);
...@@ -1061,9 +1044,8 @@ set_tpl_pfs(struct file *file, const char *buffer, ...@@ -1061,9 +1044,8 @@ set_tpl_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -1094,9 +1076,8 @@ set_wait_at_pwup_pfs(struct file *file, const char *buffer, ...@@ -1094,9 +1076,8 @@ set_wait_at_pwup_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
...@@ -1126,9 +1107,8 @@ set_hw_reset_pfs(struct file *file, const char *buffer, ...@@ -1126,9 +1107,8 @@ set_hw_reset_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1)) if (count > (sizeof(kbuf) - 1))
return -1; return -1;
if (copy_from_user(&kbuf, buffer, count)) { if (copy_from_user(&kbuf, buffer, count))
return -1; return -1;
}
kbuf[count] = '\0'; kbuf[count] = '\0';
length = strlen(kbuf); length = strlen(kbuf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment