smsc95xx: remove redundant function arguments

[ Upstream commit 368be1ca28f66deba16627e2a02e78adedd023a6 ]

This patch removes arguments netdev and phy_id from the functions
smsc95xx_mdio_read_nopm and smsc95xx_mdio_write_nopm.  Both removed
arguments are recovered from a new argument `struct usbnet *dev`.

Signed-off-by: Andre Edich <andre.edich@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 52a2f0608366 ("net: usb: smsc95xx: fix changing LED_SEL bit value updated from EEPROM")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 1aa99727d40c7356ae1143aac115eaa3faa95d09..6fe6edc59623dab1124826d9b16dc16e3cbd37b2 100644 (file)
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -261,16 +261,18 @@ done:
        mutex_unlock(&dev->phy_mutex);
 }
 
-static int smsc95xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
-                                  int idx)
+static int smsc95xx_mdio_read_nopm(struct usbnet *dev, int idx)
 {
-       return __smsc95xx_mdio_read(netdev, phy_id, idx, 1);
+       struct mii_if_info *mii = &dev->mii;
+
+       return __smsc95xx_mdio_read(dev->net, mii->phy_id, idx, 1);
 }
 
-static void smsc95xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
-                                    int idx, int regval)
+static void smsc95xx_mdio_write_nopm(struct usbnet *dev, int idx, int regval)
 {
-       __smsc95xx_mdio_write(netdev, phy_id, idx, regval, 1);
+       struct mii_if_info *mii = &dev->mii;
+
+       __smsc95xx_mdio_write(dev->net, mii->phy_id, idx, regval, 1);
 }
 
 static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
@@ -1347,39 +1349,37 @@ static u32 smsc_crc(const u8 *buffer, size_t len, int filter)
 
 static int smsc95xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
 {
-       struct mii_if_info *mii = &dev->mii;
        int ret;
 
        netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n");
 
        /* read to clear */
-       ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC);
+       ret = smsc95xx_mdio_read_nopm(dev, PHY_INT_SRC);
        if (ret < 0)
                return ret;
 
        /* enable interrupt source */
-       ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK);
+       ret = smsc95xx_mdio_read_nopm(dev, PHY_INT_MASK);
        if (ret < 0)
                return ret;
 
        ret |= mask;
 
-       smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret);
+       smsc95xx_mdio_write_nopm(dev, PHY_INT_MASK, ret);
 
        return 0;
 }
 
 static int smsc95xx_link_ok_nopm(struct usbnet *dev)
 {
-       struct mii_if_info *mii = &dev->mii;
        int ret;
 
        /* first, a dummy read, needed to latch some MII phys */
-       ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
+       ret = smsc95xx_mdio_read_nopm(dev, MII_BMSR);
        if (ret < 0)
                return ret;
 
-       ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
+       ret = smsc95xx_mdio_read_nopm(dev, MII_BMSR);
        if (ret < 0)
                return ret;
 
@@ -1428,7 +1428,6 @@ static int smsc95xx_enter_suspend0(struct usbnet *dev)
 static int smsc95xx_enter_suspend1(struct usbnet *dev)
 {
        struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-       struct mii_if_info *mii = &dev->mii;
        u32 val;
        int ret;
 
@@ -1436,17 +1435,17 @@ static int smsc95xx_enter_suspend1(struct usbnet *dev)
         * compatibility with non-standard link partners
         */
        if (pdata->features & FEATURE_PHY_NLP_CROSSOVER)
-               smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_EDPD_CONFIG,
-                       PHY_EDPD_CONFIG_DEFAULT);
+               smsc95xx_mdio_write_nopm(dev, PHY_EDPD_CONFIG,
+                                        PHY_EDPD_CONFIG_DEFAULT);
 
        /* enable energy detect power-down mode */
-       ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS);
+       ret = smsc95xx_mdio_read_nopm(dev, PHY_MODE_CTRL_STS);
        if (ret < 0)
                return ret;
 
        ret |= MODE_CTRL_STS_EDPWRDOWN_;
 
-       smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS, ret);
+       smsc95xx_mdio_write_nopm(dev, PHY_MODE_CTRL_STS, ret);
 
        /* enter SUSPEND1 mode */
        ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);