]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: usb: ax88179_178a: Use linkmode helpers for EEE
authorAndrew Lunn <andrew@lunn.ch>
Tue, 27 Feb 2024 01:29:08 +0000 (19:29 -0600)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Feb 2024 12:18:04 +0000 (12:18 +0000)
Make use of the existing linkmode helpers for converting PHY EEE
register values into links modes, now that ethtool_keee uses link
modes, rather than u32 values.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/ax88179_178a.c

index d6168eaa286fe0b2788a317597db046f8f7ce44b..88e084534853dd50505fd730e7ccd07c70f2d8ee 100644 (file)
@@ -676,21 +676,21 @@ ax88179_ethtool_get_eee(struct usbnet *dev, struct ethtool_keee *data)
                                            MDIO_MMD_PCS);
        if (val < 0)
                return val;
-       data->supported_u32 = mmd_eee_cap_to_ethtool_sup_t(val);
+       mii_eee_cap1_mod_linkmode_t(data->supported, val);
 
        /* Get advertisement EEE */
        val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_ADV,
                                            MDIO_MMD_AN);
        if (val < 0)
                return val;
-       data->advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(val);
+       mii_eee_cap1_mod_linkmode_t(data->advertised, val);
 
        /* Get LP advertisement EEE */
        val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_LPABLE,
                                            MDIO_MMD_AN);
        if (val < 0)
                return val;
-       data->lp_advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(val);
+       mii_eee_cap1_mod_linkmode_t(data->lp_advertised, val);
 
        return 0;
 }
@@ -698,7 +698,7 @@ ax88179_ethtool_get_eee(struct usbnet *dev, struct ethtool_keee *data)
 static int
 ax88179_ethtool_set_eee(struct usbnet *dev, struct ethtool_keee *data)
 {
-       u16 tmp16 = ethtool_adv_to_mmd_eee_adv_t(data->advertised_u32);
+       u16 tmp16 = linkmode_to_mii_eee_cap1_t(data->advertised);
 
        return ax88179_phy_write_mmd_indirect(dev, MDIO_AN_EEE_ADV,
                                              MDIO_MMD_AN, tmp16);
@@ -1663,7 +1663,7 @@ static int ax88179_reset(struct usbnet *dev)
        ax88179_disable_eee(dev);
 
        ax88179_ethtool_get_eee(dev, &eee_data);
-       eee_data.advertised_u32 = 0;
+       linkmode_zero(eee_data.advertised);
        ax88179_ethtool_set_eee(dev, &eee_data);
 
        /* Restart autoneg */