Skip to content

Commit

Permalink
staging: silicom: remove unnecessary braces in bp_proc.c
Browse files Browse the repository at this point in the history 
Remove unnecessary braces from single statement blocks in bp_proc.c,
resolving checkpatch.pl warnings.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Chad Williamson authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent ed5054b commit c460c7d
Showing 1 changed file with 19 additions and 39 deletions.
58 changes: 19 additions & 39 deletions drivers/staging/silicom/bp_proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ static struct proc_dir_entry *proc_getdir(char *name,
if (pde == (struct proc_dir_entry *)0) {
/* create the directory */
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;
}
Expand All @@ -107,10 +106,8 @@ bypass_proc_create_entry_sd(struct pfs_unit *pfs_unit_curr,
S_IFREG | S_IRUSR |
S_IWUSR | S_IRGRP |
S_IROTH, parent_pfs);
if (pfs_unit_curr->proc_entry == 0) {

if (pfs_unit_curr->proc_entry == 0)
return -1;
}

pfs_unit_curr->proc_entry->read_proc = read_proc;
pfs_unit_curr->proc_entry->write_proc = write_proc;
Expand Down Expand Up @@ -207,9 +204,8 @@ set_bypass_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -239,9 +235,8 @@ set_tap_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -271,9 +266,8 @@ set_disc_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -421,9 +415,8 @@ set_bypass_wd_pfs(struct file *file, const char *buffer,
unsigned int timeout = 0;
char *timeout_ptr = kbuf;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

timeout_ptr = kbuf;
timeout = atoi(&timeout_ptr);
Expand Down Expand Up @@ -570,9 +563,8 @@ set_dis_bypass_pfs(struct file *file, const char *buffer,

int bypass_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand All @@ -599,9 +591,8 @@ set_dis_tap_pfs(struct file *file, const char *buffer,

int tap_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand All @@ -628,9 +619,8 @@ set_dis_disc_pfs(struct file *file, const char *buffer,

int tap_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -717,9 +707,8 @@ set_bypass_pwup_pfs(struct file *file, const char *buffer,

int bypass_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand All @@ -746,9 +735,8 @@ set_bypass_pwoff_pfs(struct file *file, const char *buffer,

int bypass_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand All @@ -775,9 +763,8 @@ set_tap_pwup_pfs(struct file *file, const char *buffer,

int tap_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand All @@ -804,9 +791,8 @@ set_disc_pwup_pfs(struct file *file, const char *buffer,

int tap_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -913,9 +899,8 @@ set_std_nic_pfs(struct file *file, const char *buffer,

int bypass_param = 0, length = 0;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -988,9 +973,8 @@ set_wd_exp_mode_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -1036,9 +1020,8 @@ set_wd_autoreset_pfs(struct file *file, const char *buffer,
u32 timeout = 0;
char *timeout_ptr = kbuf;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

timeout_ptr = kbuf;
timeout = atoi(&timeout_ptr);
Expand All @@ -1061,9 +1044,8 @@ set_tpl_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -1094,9 +1076,8 @@ set_wait_at_pwup_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down Expand Up @@ -1126,9 +1107,8 @@ set_hw_reset_pfs(struct file *file, const char *buffer,
if (count > (sizeof(kbuf) - 1))
return -1;

if (copy_from_user(&kbuf, buffer, count)) {
if (copy_from_user(&kbuf, buffer, count))
return -1;
}

kbuf[count] = '\0';
length = strlen(kbuf);
Expand Down

0 comments on commit c460c7d

Please sign in to comment.