net: convert additional drivers to use phy_do_ioctl
Subsystems (4)
PATCH 1/1 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 <[email protected]>
--- drivers/net/ethernet/aurora/nb8800.c | 7 +------ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 4 +--- drivers/net/ethernet/lantiq_etop.c | 9 +-------- drivers/net/ethernet/marvell/pxa168_eth.c | 11 +---------- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +--- drivers/net/ethernet/socionext/netsec.c | 8 +------- 6 files changed, 6 insertions(+), 37 deletions(-)
drivers/net/ethernet/aurora/nb8800.c +1 -6
@@ -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, };
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +1 -3
@@ -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); } }
drivers/net/ethernet/lantiq_etop.c +1 -8
@@ -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,
drivers/net/ethernet/marvell/pxa168_eth.c +1 -10
@@ -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
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +1 -3
@@ -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 ;
drivers/net/ethernet/socionext/netsec.c +1 -7
@@ -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, };
Signature · 1 line
2.25.0
Quoted 4 lines · Heiner Kallweit
The first batch of driver conversions missed a few cases where we can use
phy_do_ioctltoo.Signed-off-by Heiner Kallweit <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Andrew
From: Heiner Kallweit <[email protected]>
Date: Tue, 21 Jan 2020 22:05:14 +0100
Quoted 4 lines
The first batch of driver conversions missed a few cases where we can use
phy_do_ioctltoo.Signed-off-by Heiner Kallweit <[email protected]>
Applied.