Commit 625eb866 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: ethernet: broadcom: bcm63xx: use phydev from struct net_device 



The private structure contain a pointer to phydev, but the structure
net_device already contain such pointer. So we can remove the pointer
phydev in the private structure, and update the driver to use the
one contained in struct net_device.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2406e5d4

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+14 −17
Original line number Original line Diff line number Diff line
@@ -791,7 +791,7 @@ static void bcm_enet_adjust_phy_link(struct net_device *dev) 
	int status_changed;

	int status_changed;





	priv = netdev_priv(dev);

	priv = netdev_priv(dev);

	phydev = priv->phydev;

	phydev = dev->phydev;

	status_changed = 0;

	status_changed = 0;





	if (priv->old_link != phydev->link) {

	if (priv->old_link != phydev->link) {
@@ -913,7 +913,6 @@ static int bcm_enet_open(struct net_device *dev) 
		priv->old_link = 0;

		priv->old_link = 0;

		priv->old_duplex = -1;

		priv->old_duplex = -1;

		priv->old_pause = -1;

		priv->old_pause = -1;

		priv->phydev = phydev;

	}

	}





	/* mask all interrupts and request them */

	/* mask all interrupts and request them */
@@ -1085,7 +1084,7 @@ static int bcm_enet_open(struct net_device *dev) 
			 ENETDMAC_IRMASK, priv->tx_chan);

			 ENETDMAC_IRMASK, priv->tx_chan);





	if (priv->has_phy)

	if (priv->has_phy)

		phy_start(priv->phydev);

		phy_start(phydev);

	else

	else

		bcm_enet_adjust_link(dev);

		bcm_enet_adjust_link(dev);
@@ -1127,7 +1126,7 @@ out_freeirq: 
	free_irq(dev->irq, dev);

	free_irq(dev->irq, dev);





out_phy_disconnect:

out_phy_disconnect:

	phy_disconnect(priv->phydev);

	phy_disconnect(phydev);





	return ret;

	return ret;

}

}
@@ -1190,7 +1189,7 @@ static int bcm_enet_stop(struct net_device *dev) 
	netif_stop_queue(dev);

	netif_stop_queue(dev);

	napi_disable(&priv->napi);

	napi_disable(&priv->napi);

	if (priv->has_phy)

	if (priv->has_phy)

		phy_stop(priv->phydev);

		phy_stop(dev->phydev);

	del_timer_sync(&priv->rx_timeout);

	del_timer_sync(&priv->rx_timeout);





	/* mask all interrupts */

	/* mask all interrupts */
@@ -1234,10 +1233,8 @@ static int bcm_enet_stop(struct net_device *dev) 
	free_irq(dev->irq, dev);

	free_irq(dev->irq, dev);





	/* release phy */

	/* release phy */

	if (priv->has_phy) {

	if (priv->has_phy)

		phy_disconnect(priv->phydev);

		phy_disconnect(dev->phydev);

		priv->phydev = NULL;

	}





	return 0;

	return 0;

}

}
@@ -1437,9 +1434,9 @@ static int bcm_enet_nway_reset(struct net_device *dev) 




	priv = netdev_priv(dev);

	priv = netdev_priv(dev);

	if (priv->has_phy) {

	if (priv->has_phy) {

		if (!priv->phydev)

		if (!dev->phydev)

			return -ENODEV;

			return -ENODEV;

		return genphy_restart_aneg(priv->phydev);

		return genphy_restart_aneg(dev->phydev);

	}

	}





	return -EOPNOTSUPP;

	return -EOPNOTSUPP;
@@ -1456,9 +1453,9 @@ static int bcm_enet_get_settings(struct net_device *dev, 
	cmd->maxtxpkt = 0;

	cmd->maxtxpkt = 0;





	if (priv->has_phy) {

	if (priv->has_phy) {

		if (!priv->phydev)

		if (!dev->phydev)

			return -ENODEV;

			return -ENODEV;

		return phy_ethtool_gset(priv->phydev, cmd);

		return phy_ethtool_gset(dev->phydev, cmd);

	} else {

	} else {

		cmd->autoneg = 0;

		cmd->autoneg = 0;

		ethtool_cmd_speed_set(cmd, ((priv->force_speed_100)

		ethtool_cmd_speed_set(cmd, ((priv->force_speed_100)
@@ -1483,9 +1480,9 @@ static int bcm_enet_set_settings(struct net_device *dev, 




	priv = netdev_priv(dev);

	priv = netdev_priv(dev);

	if (priv->has_phy) {

	if (priv->has_phy) {

		if (!priv->phydev)

		if (!dev->phydev)

			return -ENODEV;

			return -ENODEV;

		return phy_ethtool_sset(priv->phydev, cmd);

		return phy_ethtool_sset(dev->phydev, cmd);

	} else {

	} else {





		if (cmd->autoneg ||

		if (cmd->autoneg ||
@@ -1604,9 +1601,9 @@ static int bcm_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 




	priv = netdev_priv(dev);

	priv = netdev_priv(dev);

	if (priv->has_phy) {

	if (priv->has_phy) {

		if (!priv->phydev)

		if (!dev->phydev)

			return -ENODEV;

			return -ENODEV;

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

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

	} else {

	} else {

		struct mii_if_info mii;

		struct mii_if_info mii;

drivers/net/ethernet/broadcom/bcm63xx_enet.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -290,7 +290,6 @@ struct bcm_enet_priv { 




	/* used when a phy is connected (phylib used) */

	/* used when a phy is connected (phylib used) */

	struct mii_bus *mii_bus;

	struct mii_bus *mii_bus;

	struct phy_device *phydev;

	int old_link;

	int old_link;

	int old_duplex;

	int old_duplex;

	int old_pause;

	int old_pause;

CRA Git | Maintained and supported by SUSTech CRA and CCSE