ethtool: cosmetic: Use ethtool ethtool_cmd_speed API

This updates the network drivers so that they don't access the
ethtool_cmd::speed field directly, but use ethtool_cmd_speed()
instead.

For most of the drivers, these changes are purely cosmetic and don't
fix any problem, such as for those 1GbE/10GbE drivers that indirectly
call their own ethtool get_settings()/mii_ethtool_gset(). The changes
are meant to enforce code consistency and provide robustness with
future larger throughputs, at the expense of a few CPU cycles for each
ethtool operation.

All drivers compiled with make allyesconfig ion x86_64 have been
updated.

Tested: make allyesconfig on x86_64 + e1000e/bnx2x work
Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 9a8f116e6920..06daa9d6fee8 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -3182,7 +3182,8 @@ static void velocity_ethtool_down(struct net_device *dev)
                 pci_set_power_state(vptr->pdev, PCI_D3hot);
 }
 
-static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int velocity_get_settings(struct net_device *dev,
+                                 struct ethtool_cmd *cmd)
 {
         struct velocity_info *vptr = netdev_priv(dev);
         struct mac_regs __iomem *regs = vptr->mac_regs;
@@ -3228,12 +3229,14 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd
                         break;
                 }
         }
+
         if (status & VELOCITY_SPEED_1000)
-                cmd->speed = SPEED_1000;
+                ethtool_cmd_speed_set(cmd, SPEED_1000);
         else if (status & VELOCITY_SPEED_100)
-                cmd->speed = SPEED_100;
+                ethtool_cmd_speed_set(cmd, SPEED_100);
         else
-                cmd->speed = SPEED_10;
+                ethtool_cmd_speed_set(cmd, SPEED_10);
+
         cmd->autoneg = (status & VELOCITY_AUTONEG_ENABLE) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
         cmd->port = PORT_TP;
         cmd->transceiver = XCVR_INTERNAL;