mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 02:39:48 +00:00
Code Issues Releases Wiki Activity

net: ethernet: nb8800: use phydev from struct net_device

Browse source 
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: Philippe Reynes <tremyfr@gmail.com>
Acked-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes 2016-06-18 23:16:54 +02:00 committed by David S. Miller
parent bd081e4b02
commit 46bb0bb094
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
drivers/net/ethernet/aurora/nb8800.c
View file

@ -631,7 +631,7 @@ static void nb8800_mac_config(struct net_device *dev)
static void nb8800_pause_config(struct net_device *dev) static void nb8800_pause_config(struct net_device *dev)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_priv *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phydev; struct phy_device *phydev = dev->phydev;
u32 rxcr; u32 rxcr;
if (priv->pause_aneg) { if (priv->pause_aneg) {
@ -664,7 +664,7 @@ static void nb8800_pause_config(struct net_device *dev)
static void nb8800_link_reconfigure(struct net_device *dev) static void nb8800_link_reconfigure(struct net_device *dev)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_priv *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phydev; struct phy_device *phydev = dev->phydev;
int change = 0; int change = 0;
if (phydev->link) { if (phydev->link) {
@ -690,7 +690,7 @@ static void nb8800_link_reconfigure(struct net_device *dev)
} }
if (change) if (change)
phy_print_status(priv->phydev); phy_print_status(phydev);
} }
static void nb8800_update_mac_addr(struct net_device *dev) static void nb8800_update_mac_addr(struct net_device *dev)
@ -935,9 +935,10 @@ static int nb8800_dma_stop(struct net_device *dev)
static void nb8800_pause_adv(struct net_device *dev) static void nb8800_pause_adv(struct net_device *dev)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_priv *priv = netdev_priv(dev);
struct phy_device *phydev = dev->phydev;
u32 adv = 0; u32 adv = 0;
if (!priv->phydev) if (!phydev)
return; return;
if (priv->pause_rx) if (priv->pause_rx)
@ -945,13 +946,14 @@ static void nb8800_pause_adv(struct net_device *dev)
if (priv->pause_tx) if (priv->pause_tx)
adv ^= ADVERTISED_Asym_Pause; adv ^= ADVERTISED_Asym_Pause;
priv->phydev->supported |= adv; phydev->supported |= adv;
priv->phydev->advertising |= adv; phydev->advertising |= adv;
} }
static int nb8800_open(struct net_device *dev) static int nb8800_open(struct net_device *dev)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_priv *priv = netdev_priv(dev);
struct phy_device *phydev;
int err; int err;
/* clear any pending interrupts */ /* clear any pending interrupts */
@ -969,10 +971,10 @@ static int nb8800_open(struct net_device *dev)
nb8800_mac_rx(dev, true); nb8800_mac_rx(dev, true);
nb8800_mac_tx(dev, true); nb8800_mac_tx(dev, true);
priv->phydev = of_phy_connect(dev, priv->phy_node, phydev = of_phy_connect(dev, priv->phy_node,
nb8800_link_reconfigure, 0, nb8800_link_reconfigure, 0,
priv->phy_mode); priv->phy_mode);
if (!priv->phydev) if (!phydev)
goto err_free_irq; goto err_free_irq;
nb8800_pause_adv(dev); nb8800_pause_adv(dev);
@ -982,7 +984,7 @@ static int nb8800_open(struct net_device *dev)
netif_start_queue(dev); netif_start_queue(dev);
nb8800_start_rx(dev); nb8800_start_rx(dev);
phy_start(priv->phydev); phy_start(phydev);
return 0; return 0;
@ -997,8 +999,9 @@ static int nb8800_open(struct net_device *dev)
static int nb8800_stop(struct net_device *dev) static int nb8800_stop(struct net_device *dev)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_priv *priv = netdev_priv(dev);
struct phy_device *phydev = dev->phydev;
phy_stop(priv->phydev); phy_stop(phydev);
netif_stop_queue(dev); netif_stop_queue(dev);
napi_disable(&priv->napi); napi_disable(&priv->napi);
@ -1007,8 +1010,7 @@ static int nb8800_stop(struct net_device *dev)
nb8800_mac_rx(dev, false); nb8800_mac_rx(dev, false);
nb8800_mac_tx(dev, false); nb8800_mac_tx(dev, false);
phy_disconnect(priv->phydev); phy_disconnect(phydev);
priv->phydev = NULL;
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
@ -1019,9 +1021,7 @@ static int nb8800_stop(struct net_device *dev)
static int nb8800_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int nb8800_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct nb8800_priv *priv = netdev_priv(dev); return phy_mii_ioctl(dev->phydev, rq, cmd);
return phy_mii_ioctl(priv->phydev, rq, cmd);
} }
static const struct net_device_ops nb8800_netdev_ops = { static const struct net_device_ops nb8800_netdev_ops = {
@ -1037,32 +1037,32 @@ static const struct net_device_ops nb8800_netdev_ops = {
static int nb8800_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int nb8800_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct phy_device *phydev = dev->phydev;
if (!priv->phydev) if (!phydev)
return -ENODEV; return -ENODEV;
return phy_ethtool_gset(priv->phydev, cmd); return phy_ethtool_gset(phydev, cmd);
} }
static int nb8800_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int nb8800_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct phy_device *phydev = dev->phydev;
if (!priv->phydev) if (!phydev)
return -ENODEV; return -ENODEV;
return phy_ethtool_sset(priv->phydev, cmd); return phy_ethtool_sset(phydev, cmd);
} }
static int nb8800_nway_reset(struct net_device *dev) static int nb8800_nway_reset(struct net_device *dev)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct phy_device *phydev = dev->phydev;
if (!priv->phydev) if (!phydev)
return -ENODEV; return -ENODEV;
return genphy_restart_aneg(priv->phydev); return genphy_restart_aneg(phydev);
} }
static void nb8800_get_pauseparam(struct net_device *dev, static void nb8800_get_pauseparam(struct net_device *dev,
@ -1079,6 +1079,7 @@ static int nb8800_set_pauseparam(struct net_device *dev,
struct ethtool_pauseparam *pp) struct ethtool_pauseparam *pp)
{ {
struct nb8800_priv *priv = netdev_priv(dev); struct nb8800_priv *priv = netdev_priv(dev);
struct phy_device *phydev = dev->phydev;
priv->pause_aneg = pp->autoneg; priv->pause_aneg = pp->autoneg;
priv->pause_rx = pp->rx_pause; priv->pause_rx = pp->rx_pause;
@ -1088,8 +1089,8 @@ static int nb8800_set_pauseparam(struct net_device *dev,
if (!priv->pause_aneg) if (!priv->pause_aneg)
nb8800_pause_config(dev); nb8800_pause_config(dev);
else if (priv->phydev) else if (phydev)
phy_start_aneg(priv->phydev); phy_start_aneg(phydev);
return 0; return 0;
} }

1
drivers/net/ethernet/aurora/nb8800.h
View file

@ -284,7 +284,6 @@ struct nb8800_priv {
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
struct device_node *phy_node; struct device_node *phy_node;
struct phy_device *phydev;
/* PHY connection type from DT */ /* PHY connection type from DT */
int phy_mode; int phy_mode;