Commit c5d19a6e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f2c17e0

drivers/net/ethernet/aurora/nb8800.c

+1 −6
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE