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>

2 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 4af235d41fd..e252cd59501 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -591,10 +591,11 @@ static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
 static int etherh_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         cmd->supported  = etherh_priv(dev)->supported;
-        cmd->speed      = SPEED_10;
+        ethtool_cmd_speed_set(cmd, SPEED_10);
         cmd->duplex     = DUPLEX_HALF;
         cmd->port       = dev->if_port == IF_PORT_10BASET ? PORT_TP : PORT_BNC;
-        cmd->autoneg    = dev->flags & IFF_AUTOMEDIA ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+        cmd->autoneg    = (dev->flags & IFF_AUTOMEDIA ?
+                           AUTONEG_ENABLE : AUTONEG_DISABLE);
         return 0;
 }
 
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index aa07657744c..a7b0caa1817 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -891,15 +891,16 @@ ks8695_wan_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
                         cmd->advertising |= ADVERTISED_Pause;
                 cmd->autoneg = AUTONEG_ENABLE;
 
-                cmd->speed = (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10;
+                ethtool_cmd_speed_set(cmd,
+                                      (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10);
                 cmd->duplex = (ctrl & WMC_WDS) ?
                         DUPLEX_FULL : DUPLEX_HALF;
         } else {
                 /* auto-negotiation is disabled */
                 cmd->autoneg = AUTONEG_DISABLE;
 
-                cmd->speed = (ctrl & WMC_WANF100) ?
-                        SPEED_100 : SPEED_10;
+                ethtool_cmd_speed_set(cmd, ((ctrl & WMC_WANF100) ?
+                                            SPEED_100 : SPEED_10));
                 cmd->duplex = (ctrl & WMC_WANFF) ?
                         DUPLEX_FULL : DUPLEX_HALF;
         }