diff options
author | Rick Jones <rick.jones2@hp.com> | 2012-04-26 07:20:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-27 00:03:35 -0400 |
commit | 13b95fb714d7b7996e8d423d907beea17ad5c380 (patch) | |
tree | 20d1487f7a109678fbabb41cb3d99322df978b55 /drivers/net/bonding | |
parent | 4fbec4d86f7a1b4dbaddecda24da08b5473cd289 (diff) |
bonding: bond_update_speed_duplex() can return void since no callers check its return
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>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 44e6a64eecdd..16dbf53e314b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -549,9 +549,9 @@ down: | |||
549 | * Get link speed and duplex from the slave's base driver | 549 | * Get link speed and duplex from the slave's base driver |
550 | * using ethtool. If for some reason the call fails or the | 550 | * using ethtool. If for some reason the call fails or the |
551 | * values are invalid, set speed and duplex to -1, | 551 | * values are invalid, set speed and duplex to -1, |
552 | * and return error. | 552 | * and return. |
553 | */ | 553 | */ |
554 | static int bond_update_speed_duplex(struct slave *slave) | 554 | static void bond_update_speed_duplex(struct slave *slave) |
555 | { | 555 | { |
556 | struct net_device *slave_dev = slave->dev; | 556 | struct net_device *slave_dev = slave->dev; |
557 | struct ethtool_cmd ecmd; | 557 | struct ethtool_cmd ecmd; |
@@ -563,24 +563,24 @@ static int bond_update_speed_duplex(struct slave *slave) | |||
563 | 563 | ||
564 | res = __ethtool_get_settings(slave_dev, &ecmd); | 564 | res = __ethtool_get_settings(slave_dev, &ecmd); |
565 | if (res < 0) | 565 | if (res < 0) |
566 | return -1; | 566 | return; |
567 | 567 | ||
568 | slave_speed = ethtool_cmd_speed(&ecmd); | 568 | slave_speed = ethtool_cmd_speed(&ecmd); |
569 | if (slave_speed == 0 || slave_speed == ((__u32) -1)) | 569 | if (slave_speed == 0 || slave_speed == ((__u32) -1)) |
570 | return -1; | 570 | return; |
571 | 571 | ||
572 | switch (ecmd.duplex) { | 572 | switch (ecmd.duplex) { |
573 | case DUPLEX_FULL: | 573 | case DUPLEX_FULL: |
574 | case DUPLEX_HALF: | 574 | case DUPLEX_HALF: |
575 | break; | 575 | break; |
576 | default: | 576 | default: |
577 | return -1; | 577 | return; |
578 | } | 578 | } |
579 | 579 | ||
580 | slave->speed = slave_speed; | 580 | slave->speed = slave_speed; |
581 | slave->duplex = ecmd.duplex; | 581 | slave->duplex = ecmd.duplex; |
582 | 582 | ||
583 | return 0; | 583 | return; |
584 | } | 584 | } |
585 | 585 | ||
586 | /* | 586 | /* |