]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
r8169: use phy_mii_ioctl
authorHeiner Kallweit <hkallweit1@gmail.com>
Tue, 17 Jul 2018 20:51:53 +0000 (22:51 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2018 00:46:32 +0000 (09:46 +0900)
Switch to using phy_mii_ioctl().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 7c56202f11856bd8206b4b0bf6005fb2e3a73596..1937d12a4c2e83528bb3da93601241701f15a155 100644 (file)
@@ -4283,31 +4283,12 @@ static int rtl_set_mac_address(struct net_device *dev, void *p)
        return 0;
 }
 
-static int rtl_xmii_ioctl(struct rtl8169_private *tp,
-                         struct mii_ioctl_data *data, int cmd)
-{
-       switch (cmd) {
-       case SIOCGMIIPHY:
-               data->phy_id = 32; /* Internal PHY */
-               return 0;
-
-       case SIOCGMIIREG:
-               data->val_out = rtl_readphy(tp, data->reg_num & 0x1f);
-               return 0;
-
-       case SIOCSMIIREG:
-               rtl_writephy(tp, data->reg_num & 0x1f, data->val_in);
-               return 0;
-       }
-       return -EOPNOTSUPP;
-}
-
 static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       struct rtl8169_private *tp = netdev_priv(dev);
-       struct mii_ioctl_data *data = if_mii(ifr);
+       if (!netif_running(dev))
+               return -ENODEV;
 
-       return netif_running(dev) ? rtl_xmii_ioctl(tp, data, cmd) : -ENODEV;
+       return phy_mii_ioctl(dev->phydev, ifr, cmd);
 }
 
 static void rtl_init_mdio_ops(struct rtl8169_private *tp)