[PATCH 05/19] usbnet: smsc95xx: Remove smsc95xx_{read,write}_nopm()

[Marek Vasut]

These functions are now equal to smsc95xx_mdio_{read,write}(),
deduplicate them.

Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: David S. Miller <da...@davemloft.net>
Cc: Nisar Sayed <nisar.sa...@microchip.com>
Cc: Woojung Huh <woojung....@microchip.com>
Cc: Andrew Lunn <and...@lunn.ch>
Cc: Florian Fainelli <f.faine...@gmail.com>
Cc: linux-...@vger.kernel.org
To: netdev@vger.kernel.org
---
 drivers/net/usb/smsc95xx.c | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 6c48fec2e5b5..1ab7e6fa6d7a 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -252,18 +252,6 @@ static void __smsc95xx_mdio_write(struct net_device 
*netdev, int phy_id,
        mutex_unlock(&dev->phy_mutex);
 }
 
-static int smsc95xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
-                                  int idx)
-{
-       return __smsc95xx_mdio_read(netdev, phy_id, idx);
-}
-
-static void smsc95xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
-                                    int idx, int regval)
-{
-       __smsc95xx_mdio_write(netdev, phy_id, idx, regval);
-}
-
 static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
 {
        return __smsc95xx_mdio_read(netdev, phy_id, idx);
@@ -1340,18 +1328,18 @@ static int smsc95xx_enable_phy_wakeup_interrupts(struct 
usbnet *dev, u16 mask)
        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(dev->net, mii->phy_id, 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(dev->net, mii->phy_id, 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(dev->net, mii->phy_id, PHY_INT_MASK, ret);
 
        return 0;
 }
@@ -1362,11 +1350,11 @@ static int smsc95xx_link_ok_nopm(struct usbnet *dev)
        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(dev->net, mii->phy_id, MII_BMSR);
        if (ret < 0)
                return ret;
 
-       ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
+       ret = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_BMSR);
        if (ret < 0)
                return ret;
 
@@ -1423,17 +1411,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(dev->net, mii->phy_id, 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(dev->net, mii->phy_id, 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(dev->net, mii->phy_id, PHY_MODE_CTRL_STS, ret);
 
        /* enter SUSPEND1 mode */
        ret = smsc95xx_read_reg(dev, PM_CTRL, &val);
-- 
2.19.2