diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2018-07-17 22:51:53 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-07-18 09:46:32 +0900 |
| commit | 69b3c59fe212ff0a90e52bef2073b0c3cc7eff91 (patch) | |
| tree | 965974aa722b6c2b290dedca28066179ed54a2af /drivers/net/ethernet/realtek | |
| parent | r8169: use phy_ethtool_nway_reset (diff) | |
| download | linux-dev-69b3c59fe212ff0a90e52bef2073b0c3cc7eff91.tar.xz linux-dev-69b3c59fe212ff0a90e52bef2073b0c3cc7eff91.zip | |
r8169: use phy_mii_ioctl
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>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7c56202f1185..1937d12a4c2e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -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) |