diff options
| author | Philippe Reynes <tremyfr@gmail.com> | 2016-07-30 16:22:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-09 00:42:20 +0200 |
| commit | 65752dda4b525730746085a351e6e936d29bc586 (patch) | |
| tree | e5f7ba7797f8fc114835ba91c192be2fdde9be1a /drivers/net/ethernet/aeroflex | |
| parent | net: ethernet: octeon: use phy_ethtool_{get|set}_link_ksettings (diff) | |
| download | linux-65752dda4b525730746085a351e6e936d29bc586.tar.xz linux-65752dda4b525730746085a351e6e936d29bc586.zip | |
net: ethernet: greth: 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
phy 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aeroflex')
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 23 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.h | 1 |
2 files changed, 11 insertions, 13 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index bca07c5c94bd..010978bb295f 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -1107,8 +1107,7 @@ static void greth_set_msglevel(struct net_device *dev, u32 value) } static int greth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { - struct greth_private *greth = netdev_priv(dev); - struct phy_device *phy = greth->phy; + struct phy_device *phy = dev->phydev; if (!phy) return -ENODEV; @@ -1118,8 +1117,7 @@ static int greth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int greth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { - struct greth_private *greth = netdev_priv(dev); - struct phy_device *phy = greth->phy; + struct phy_device *phy = dev->phydev; if (!phy) return -ENODEV; @@ -1224,7 +1222,7 @@ static int greth_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val) static void greth_link_change(struct net_device *dev) { struct greth_private *greth = netdev_priv(dev); - struct phy_device *phydev = greth->phy; + struct phy_device *phydev = dev->phydev; unsigned long flags; int status_change = 0; u32 ctrl; @@ -1307,7 +1305,6 @@ static int greth_mdio_probe(struct net_device *dev) greth->link = 0; greth->speed = 0; greth->duplex = -1; - greth->phy = phy; return 0; } @@ -1325,6 +1322,7 @@ static int greth_mdio_init(struct greth_private *greth) { int ret; unsigned long timeout; + struct net_device *ndev = greth->netdev; greth->mdio = mdiobus_alloc(); if (!greth->mdio) { @@ -1349,15 +1347,16 @@ static int greth_mdio_init(struct greth_private *greth) goto unreg_mdio; } - phy_start(greth->phy); + phy_start(ndev->phydev); /* If Ethernet debug link is used make autoneg happen right away */ if (greth->edcl && greth_edcl == 1) { - phy_start_aneg(greth->phy); + phy_start_aneg(ndev->phydev); timeout = jiffies + 6*HZ; - while (!phy_aneg_done(greth->phy) && time_before(jiffies, timeout)) { + while (!phy_aneg_done(ndev->phydev) && + time_before(jiffies, timeout)) { } - phy_read_status(greth->phy); + phy_read_status(ndev->phydev); greth_link_change(greth->netdev); } @@ -1569,8 +1568,8 @@ static int greth_of_remove(struct platform_device *of_dev) dma_free_coherent(&of_dev->dev, 1024, greth->tx_bd_base, greth->tx_bd_base_phys); - if (greth->phy) - phy_stop(greth->phy); + if (ndev->phydev) + phy_stop(ndev->phydev); mdiobus_unregister(greth->mdio); unregister_netdev(ndev); diff --git a/drivers/net/ethernet/aeroflex/greth.h b/drivers/net/ethernet/aeroflex/greth.h index 92dd918e4a83..9c07140a5d8d 100644 --- a/drivers/net/ethernet/aeroflex/greth.h +++ b/drivers/net/ethernet/aeroflex/greth.h @@ -123,7 +123,6 @@ struct greth_private { struct napi_struct napi; spinlock_t devlock; - struct phy_device *phy; struct mii_bus *mdio; unsigned int link; unsigned int speed; |