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, 6 insertions, 5 deletions

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index e85c89c6706d..041fb7d43c4f 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -843,10 +843,11 @@ static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *e
         get_registers(dev, BMCR, 2, &bmcr);
         get_registers(dev, ANLP, 2, &lpa);
         if (bmcr & BMCR_ANENABLE) {
+                u32 speed = ((lpa & (LPA_100HALF | LPA_100FULL)) ?
+                             SPEED_100 : SPEED_10);
+                ethtool_cmd_speed_set(ecmd, speed);
                 ecmd->autoneg = AUTONEG_ENABLE;
-                ecmd->speed = (lpa & (LPA_100HALF | LPA_100FULL)) ?
-                             SPEED_100 : SPEED_10;
-                if (ecmd->speed == SPEED_100)
+                if (speed == SPEED_100)
                         ecmd->duplex = (lpa & LPA_100FULL) ?
                             DUPLEX_FULL : DUPLEX_HALF;
                 else
@@ -854,8 +855,8 @@ static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *e
                             DUPLEX_FULL : DUPLEX_HALF;
         } else {
                 ecmd->autoneg = AUTONEG_DISABLE;
-                ecmd->speed = (bmcr & BMCR_SPEED100) ?
-                    SPEED_100 : SPEED_10;
+                ethtool_cmd_speed_set(ecmd, ((bmcr & BMCR_SPEED100) ?
+                                             SPEED_100 : SPEED_10));
                 ecmd->duplex = (bmcr & BMCR_FULLDPLX) ?
                     DUPLEX_FULL : DUPLEX_HALF;
         }