net: convert additional drivers to use phy_do_ioctl

The first batch of driver conversions missed a few cases where we can
use phy_do_ioctl too.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 30b455013bf3d193c97feae1388947947ec91c8a..bc273e0db7ff879aa5b79732b8064d556bf6c62c 100644 (file)
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -1005,18 +1005,13 @@ static int nb8800_stop(struct net_device *dev)
        return 0;
 }
 
-static int nb8800_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
 static const struct net_device_ops nb8800_netdev_ops = {
        .ndo_open               = nb8800_open,
        .ndo_stop               = nb8800_stop,
        .ndo_start_xmit         = nb8800_xmit,
        .ndo_set_mac_address    = nb8800_set_mac_address,
        .ndo_set_rx_mode        = nb8800_set_rx_mode,
-       .ndo_do_ioctl           = nb8800_ioctl,
+       .ndo_do_ioctl           = phy_do_ioctl,
        .ndo_validate_addr      = eth_validate_addr,
 };
 

diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index cdd7e5da4a74ab183d8d80a07461e989f5f69172..e9575887a4f8f13f6e111ec5c6ce4990e8db08d7 100644 (file)
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -790,9 +790,7 @@ static int octeon_mgmt_ioctl(struct net_device *netdev,
        case SIOCSHWTSTAMP:
                return octeon_mgmt_ioctl_hwtstamp(netdev, rq, cmd);
        default:
-               if (netdev->phydev)
-                       return phy_mii_ioctl(netdev->phydev, rq, cmd);
-               return -EINVAL;
+               return phy_do_ioctl(netdev, rq, cmd);
        }
 }
 

diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 028e3e6222e945020cb14ab9f2274782785f4e28..578c31697cc0f4215da8fa36ec6e0a72dbbeb3e9 100644 (file)
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -509,13 +509,6 @@ ltq_etop_change_mtu(struct net_device *dev, int new_mtu)
        return 0;
 }
 
-static int
-ltq_etop_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       /* TODO: mii-toll reports "No MII transceiver present!." ?!*/
-       return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
 static int
 ltq_etop_set_mac_address(struct net_device *dev, void *p)
 {
@@ -616,7 +609,7 @@ static const struct net_device_ops ltq_eth_netdev_ops = {
        .ndo_stop = ltq_etop_stop,
        .ndo_start_xmit = ltq_etop_tx,
        .ndo_change_mtu = ltq_etop_change_mtu,
-       .ndo_do_ioctl = ltq_etop_ioctl,
+       .ndo_do_ioctl = phy_do_ioctl,
        .ndo_set_mac_address = ltq_etop_set_mac_address,
        .ndo_validate_addr = eth_validate_addr,
        .ndo_set_rx_mode = ltq_etop_set_multicast_list,

diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 1a6877902dd65aca5608ee456fff83b37c047bd3..7a0d785b826c6f909ce79788b2d4a887ae0a379d 100644 (file)
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1344,15 +1344,6 @@ static int pxa168_smi_write(struct mii_bus *bus, int phy_addr, int regnum,
        return 0;
 }
 
-static int pxa168_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr,
-                              int cmd)
-{
-       if (dev->phydev)
-               return phy_mii_ioctl(dev->phydev, ifr, cmd);
-
-       return -EOPNOTSUPP;
-}
-
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void pxa168_eth_netpoll(struct net_device *dev)
 {
@@ -1387,7 +1378,7 @@ static const struct net_device_ops pxa168_eth_netdev_ops = {
        .ndo_set_rx_mode        = pxa168_eth_set_rx_mode,
        .ndo_set_mac_address    = pxa168_eth_set_mac_address,
        .ndo_validate_addr      = eth_validate_addr,
-       .ndo_do_ioctl           = pxa168_eth_do_ioctl,
+       .ndo_do_ioctl           = phy_do_ioctl,
        .ndo_change_mtu         = pxa168_eth_change_mtu,
        .ndo_tx_timeout         = pxa168_eth_tx_timeout,
 #ifdef CONFIG_NET_POLL_CONTROLLER

diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
index 7d3a1c0df09c2d4468b3e68261b133bc1f0cb079..c705743d69f7ab5c806c2a8c9ccfbc4b8c0dbf92 100644 (file)
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
@@ -1939,9 +1939,7 @@ static int sxgbe_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        case SIOCGMIIPHY:
        case SIOCGMIIREG:
        case SIOCSMIIREG:
-               if (!dev->phydev)
-                       return -EINVAL;
-               ret = phy_mii_ioctl(dev->phydev, rq, cmd);
+               ret = phy_do_ioctl(dev, rq, cmd);
                break;
        default:
                break;

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index 6870a6ce76a64e54acdb249359204bfb4b417fd2..495f6cfdbd91c96d63cccab06567b194015d7692 100644 (file)
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1740,12 +1740,6 @@ static int netsec_netdev_set_features(struct net_device *ndev,
        return 0;
 }
 
-static int netsec_netdev_ioctl(struct net_device *ndev, struct ifreq *ifr,
-                              int cmd)
-{
-       return phy_mii_ioctl(ndev->phydev, ifr, cmd);
-}
-
 static int netsec_xdp_xmit(struct net_device *ndev, int n,
                           struct xdp_frame **frames, u32 flags)
 {
@@ -1830,7 +1824,7 @@ static const struct net_device_ops netsec_netdev_ops = {
        .ndo_set_features       = netsec_netdev_set_features,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
-       .ndo_do_ioctl           = netsec_netdev_ioctl,
+       .ndo_do_ioctl           = phy_do_ioctl,
        .ndo_xdp_xmit           = netsec_xdp_xmit,
        .ndo_bpf                = netsec_xdp,
 };