openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alan Cox 2012-10-11 17:23:18 +01:00 committed by Greg Kroah-Hartman
parent 720a9bece0
commit b1a4fddea0
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/silicom/bp_mod.c
View File

@ -5454,8 +5454,6 @@ static void if_scan_init(void)
dev->ethtool_ops->get_drvinfo(dev, &drvinfo); dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
} else } else
continue; continue;
if (!drvinfo.bus_info)
continue;
if (!strcmp(drvinfo.bus_info, "N/A")) if (!strcmp(drvinfo.bus_info, "N/A"))
continue; continue;
memcpy(&cbuf, drvinfo.bus_info, 32); 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; return len;
} }
net_slave_dev = pbp_device_block_slave->ndev; net_slave_dev = pbp_device_block_slave->ndev;
if (net_slave_dev) { if (net_slave_dev)
if (net_slave_dev) len = sprintf(page, "%s\n", net_slave_dev->name);
len = sprintf(page, "%s\n", net_slave_dev->name);
else
len = sprintf(page, "fail\n");
}
*eof = 1; *eof = 1;
return len; return len;