lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bonding: bond_update_speed_duplex() can return void since no callers check its return

Browse Source 
As none of the callers of bond_update_speed_duplex (need to) check its
return value, there is little point in it returning anything.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rick Jones
2012-04-26 11:20:30 +00:00
committed by David S. Miller
parent 4fbec4d86f
commit 13b95fb714
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/bonding/bond_main.c
View File

@@ -549,9 +549,9 @@ down:
* Get link speed and duplex from the slave's base driver * Get link speed and duplex from the slave's base driver
* using ethtool. If for some reason the call fails or the * using ethtool. If for some reason the call fails or the
* values are invalid, set speed and duplex to -1, * values are invalid, set speed and duplex to -1,
* and return error. * and return.
*/ */
static int bond_update_speed_duplex(struct slave *slave) static void bond_update_speed_duplex(struct slave *slave)
{ {
struct net_device *slave_dev = slave->dev; struct net_device *slave_dev = slave->dev;
struct ethtool_cmd ecmd; struct ethtool_cmd ecmd;
@@ -563,24 +563,24 @@ static int bond_update_speed_duplex(struct slave *slave)
res = __ethtool_get_settings(slave_dev, &ecmd); res = __ethtool_get_settings(slave_dev, &ecmd);
if (res < 0) if (res < 0)
return -1; return;
slave_speed = ethtool_cmd_speed(&ecmd); slave_speed = ethtool_cmd_speed(&ecmd);
if (slave_speed == 0 || slave_speed == ((__u32) -1)) if (slave_speed == 0 || slave_speed == ((__u32) -1))
return -1; return;
switch (ecmd.duplex) { switch (ecmd.duplex) {
case DUPLEX_FULL: case DUPLEX_FULL:
case DUPLEX_HALF: case DUPLEX_HALF:
break; break;
default: default:
return -1; return;
} }
slave->speed = slave_speed; slave->speed = slave_speed;
slave->duplex = ecmd.duplex; slave->duplex = ecmd.duplex;
return 0; return;
} }
/* /*