diff options
| author | Alan Cox | 2012-10-11 18:23:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-10-23 00:44:30 +0200 |
| commit | b1a4fddea0eeceacc15cb53a920cfbf4754b6ad2 (patch) | |
| tree | 06cb591d10739919c3963418167a17b4ecd7cea0 /drivers/staging/silicom | |
| parent | staging: dgrp: fix some warnings (diff) | |
| download | kernel-qcow2-linux-b1a4fddea0eeceacc15cb53a920cfbf4754b6ad2.tar.gz kernel-qcow2-linux-b1a4fddea0eeceacc15cb53a920cfbf4754b6ad2.tar.xz kernel-qcow2-linux-b1a4fddea0eeceacc15cb53a920cfbf4754b6ad2.zip | |
staging: silicom: pointless check removal
bus_info is an array not a pointer. Fix silly if check
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/silicom')
| -rw-r--r-- | drivers/staging/silicom/bp_mod.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/silicom/bp_mod.c b/drivers/staging/silicom/bp_mod.c index 3cfd0516adfa..f579f143f85f 100644 --- a/drivers/staging/silicom/bp_mod.c +++ b/drivers/staging/silicom/bp_mod.c @@ -5454,8 +5454,6 @@ static void if_scan_init(void) dev->ethtool_ops->get_drvinfo(dev, &drvinfo); } else continue; - if (!drvinfo.bus_info) - continue; if (!strcmp(drvinfo.bus_info, "N/A")) continue; memcpy(&cbuf, drvinfo.bus_info, 32); @@ -7703,13 +7701,8 @@ get_bypass_slave_pfs(char *page, char **start, off_t off, int count, return len; } net_slave_dev = pbp_device_block_slave->ndev; - if (net_slave_dev) { - if (net_slave_dev) - len = sprintf(page, "%s\n", net_slave_dev->name); - else - len = sprintf(page, "fail\n"); - - } + if (net_slave_dev) + len = sprintf(page, "%s\n", net_slave_dev->name); *eof = 1; return len; |