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

net: convert suitable drivers to use phy_do_ioctl_running 



Convert suitable drivers to use new helper phy_do_ioctl_running.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarTimur Tabi <timur@kernel.org>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 954b3c43

drivers/net/ethernet/allwinner/sun4i-emac.c

+1 −14
Original line number Diff line number Diff line
@@ -207,19 +207,6 @@ static void emac_inblk_32bit(void __iomem *reg, void *data, int count) 
	readsl(reg, data, round_up(count, 4) / 4);

}



static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	struct phy_device *phydev = dev->phydev;



	if (!netif_running(dev))

		return -EINVAL;



	if (!phydev)

		return -ENODEV;



	return phy_mii_ioctl(phydev, rq, cmd);

}



/* ethtool ops */

static void emac_get_drvinfo(struct net_device *dev,

			      struct ethtool_drvinfo *info)
@@ -791,7 +778,7 @@ static const struct net_device_ops emac_netdev_ops = { 
	.ndo_start_xmit		= emac_start_xmit,

	.ndo_tx_timeout		= emac_timeout,

	.ndo_set_rx_mode	= emac_set_rx_mode,

	.ndo_do_ioctl		= emac_ioctl,

	.ndo_do_ioctl		= phy_do_ioctl_running,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= emac_set_mac_address,

#ifdef CONFIG_NET_POLL_CONTROLLER

drivers/net/ethernet/amd/au1000_eth.c

+1 −12
Original line number Diff line number Diff line
@@ -1053,23 +1053,12 @@ static void au1000_multicast_list(struct net_device *dev) 
	writel(reg, &aup->mac->control);

}



static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	if (!netif_running(dev))

		return -EINVAL;



	if (!dev->phydev)

		return -EINVAL; /* PHY not controllable */



	return phy_mii_ioctl(dev->phydev, rq, cmd);

}



static const struct net_device_ops au1000_netdev_ops = {

	.ndo_open		= au1000_open,

	.ndo_stop		= au1000_close,

	.ndo_start_xmit		= au1000_tx,

	.ndo_set_rx_mode	= au1000_multicast_list,

	.ndo_do_ioctl		= au1000_ioctl,

	.ndo_do_ioctl		= phy_do_ioctl_running,

	.ndo_tx_timeout		= au1000_tx_timeout,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

drivers/net/ethernet/arc/emac_main.c

+1 −13
Original line number Diff line number Diff line
@@ -781,18 +781,6 @@ static int arc_emac_set_address(struct net_device *ndev, void *p) 
	return 0;

}



static int arc_emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	if (!netif_running(dev))

		return -EINVAL;



	if (!dev->phydev)

		return -ENODEV;



	return phy_mii_ioctl(dev->phydev, rq, cmd);

}





/**

 * arc_emac_restart - Restart EMAC

 * @ndev:	Pointer to net_device structure.
@@ -857,7 +845,7 @@ static const struct net_device_ops arc_emac_netdev_ops = { 
	.ndo_set_mac_address	= arc_emac_set_address,

	.ndo_get_stats		= arc_emac_stats,

	.ndo_set_rx_mode	= arc_emac_set_rx_mode,

	.ndo_do_ioctl		= arc_emac_ioctl,

	.ndo_do_ioctl		= phy_do_ioctl_running,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= arc_emac_poll_controller,

#endif

drivers/net/ethernet/broadcom/bgmac.c

+1 −9
Original line number Diff line number Diff line
@@ -1248,14 +1248,6 @@ static int bgmac_set_mac_address(struct net_device *net_dev, void *addr) 
	return 0;

}



static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)

{

	if (!netif_running(net_dev))

		return -EINVAL;



	return phy_mii_ioctl(net_dev->phydev, ifr, cmd);

}



static const struct net_device_ops bgmac_netdev_ops = {

	.ndo_open		= bgmac_open,

	.ndo_stop		= bgmac_stop,
@@ -1263,7 +1255,7 @@ static const struct net_device_ops bgmac_netdev_ops = { 
	.ndo_set_rx_mode	= bgmac_set_rx_mode,

	.ndo_set_mac_address	= bgmac_set_mac_address,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_do_ioctl           = bgmac_ioctl,

	.ndo_do_ioctl           = phy_do_ioctl_running,

};



/**************************************************

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −13
Original line number Diff line number Diff line
@@ -1225,18 +1225,6 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv, 
	}

}



/* ioctl handle special commands that are not present in ethtool. */

static int bcmgenet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	if (!netif_running(dev))

		return -EINVAL;



	if (!dev->phydev)

		return -ENODEV;



	return phy_mii_ioctl(dev->phydev, rq, cmd);

}



static struct enet_cb *bcmgenet_get_txcb(struct bcmgenet_priv *priv,

					 struct bcmgenet_tx_ring *ring)

{
@@ -3222,7 +3210,7 @@ static const struct net_device_ops bcmgenet_netdev_ops = { 
	.ndo_tx_timeout		= bcmgenet_timeout,

	.ndo_set_rx_mode	= bcmgenet_set_rx_mode,

	.ndo_set_mac_address	= bcmgenet_set_mac_addr,

	.ndo_do_ioctl		= bcmgenet_ioctl,

	.ndo_do_ioctl		= phy_do_ioctl_running,

	.ndo_set_features	= bcmgenet_set_features,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= bcmgenet_poll_controller,

CRA Git | Maintained and supported by SUSTech CRA and CCSE