Commit b1a4fdde authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

staging: silicom: pointless check removal

bus_info is an array not a pointer. Fix silly if check
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 720a9bec
...@@ -5454,8 +5454,6 @@ static void if_scan_init(void) ...@@ -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, ...@@ -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;
......
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