net: freescale: ucc_geth: Use netdev->phydev to access the PHY

As this driver pre-dates phylib, it uses a private pointer to get a
reference to the attached phy_device. Drop that pointer and use the
netdev's pointer instead.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index bf9f5901b405d0a0b49c273e62cc830ab27e009a..cc5f9ca42a780a83f76b40a21060bb92faee3f3b 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -1646,7 +1646,7 @@ static void ugeth_link_down(struct ucc_geth_private *ugeth)
 static void adjust_link(struct net_device *dev)
 {
        struct ucc_geth_private *ugeth = netdev_priv(dev);
-       struct phy_device *phydev = ugeth->phydev;
+       struct phy_device *phydev = dev->phydev;
 
        if (phydev->link)
                ugeth_link_up(ugeth, phydev, phydev->interface,
@@ -1727,8 +1727,6 @@ static int init_phy(struct net_device *dev)
 
        phy_set_max_speed(phydev, priv->max_speed);
 
-       priv->phydev = phydev;
-
        return 0;
 }
 
@@ -2001,7 +1999,7 @@ static void ucc_geth_set_multi(struct net_device *dev)
 static void ucc_geth_stop(struct ucc_geth_private *ugeth)
 {
        struct ucc_geth __iomem *ug_regs = ugeth->ug_regs;
-       struct phy_device *phydev = ugeth->phydev;
+       struct phy_device *phydev = ugeth->ndev->phydev;
 
        ugeth_vdbg("%s: IN", __func__);
 
@@ -3316,13 +3314,13 @@ static int ucc_geth_open(struct net_device *dev)
                goto err;
        }
 
-       phy_start(ugeth->phydev);
+       phy_start(dev->phydev);
        napi_enable(&ugeth->napi);
        netdev_reset_queue(dev);
        netif_start_queue(dev);
 
        device_set_wakeup_capable(&dev->dev,
-                       qe_alive_during_sleep() || ugeth->phydev->irq);
+                       qe_alive_during_sleep() || dev->phydev->irq);
        device_set_wakeup_enable(&dev->dev, ugeth->wol_en);
 
        return err;
@@ -3343,8 +3341,7 @@ static int ucc_geth_close(struct net_device *dev)
 
        cancel_work_sync(&ugeth->timeout_work);
        ucc_geth_stop(ugeth);
-       phy_disconnect(ugeth->phydev);
-       ugeth->phydev = NULL;
+       phy_disconnect(dev->phydev);
 
        free_irq(ugeth->ug_info->uf_info.irq, ugeth->ndev);
 
@@ -3378,7 +3375,7 @@ static void ucc_geth_timeout_work(struct work_struct *work)
                ucc_geth_stop(ugeth);
                ucc_geth_init_mac(ugeth);
                /* Must start PHY here */
-               phy_start(ugeth->phydev);
+               phy_start(dev->phydev);
                netif_tx_start_all_queues(dev);
        }
 
@@ -3421,7 +3418,7 @@ static int ucc_geth_suspend(struct platform_device *ofdev, pm_message_t state)
                setbits32(&ugeth->ug_regs->maccfg2, MACCFG2_MPE);
                ucc_fast_enable(ugeth->uccf, COMM_DIR_RX_AND_TX);
        } else if (!(ugeth->wol_en & WAKE_PHY)) {
-               phy_stop(ugeth->phydev);
+               phy_stop(ndev->phydev);
        }
 
        return 0;
@@ -3461,8 +3458,8 @@ static int ucc_geth_resume(struct platform_device *ofdev)
        ugeth->oldspeed = 0;
        ugeth->oldduplex = -1;
 
-       phy_stop(ugeth->phydev);
-       phy_start(ugeth->phydev);
+       phy_stop(ndev->phydev);
+       phy_start(ndev->phydev);
 
        napi_enable(&ugeth->napi);
        netif_device_attach(ndev);
@@ -3477,15 +3474,13 @@ static int ucc_geth_resume(struct platform_device *ofdev)
 
 static int ucc_geth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-       struct ucc_geth_private *ugeth = netdev_priv(dev);
-
        if (!netif_running(dev))
                return -EINVAL;
 
-       if (!ugeth->phydev)
+       if (!dev->phydev)
                return -ENODEV;
 
-       return phy_mii_ioctl(ugeth->phydev, rq, cmd);
+       return phy_mii_ioctl(dev->phydev, rq, cmd);
 }
 
 static const struct net_device_ops ucc_geth_netdev_ops = {

diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
index 4294ed096ebbc044428747986540443edc350dbe..c08a56b7c9fe3a9c1a0298b9a04c751b69a39ae2 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth.h
+++ b/drivers/net/ethernet/freescale/ucc_geth.h
@@ -1210,7 +1210,6 @@ struct ucc_geth_private {
        u16 skb_dirtytx[NUM_TX_QUEUES];
 
        struct ugeth_mii_info *mii_info;
-       struct phy_device *phydev;
        phy_interface_t phy_interface;
        int max_speed;
        uint32_t msg_enable;

diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index 699f346faf5cd745c1db93783847700a2d7cf5b5..fb5254d7d1ba37ca0d2b25ec0ea7efa0c61cfdcc 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -103,8 +103,7 @@ static const char rx_fw_stat_gstrings[][ETH_GSTRING_LEN] = {
 static int
 uec_get_ksettings(struct net_device *netdev, struct ethtool_link_ksettings *cmd)
 {
-       struct ucc_geth_private *ugeth = netdev_priv(netdev);
-       struct phy_device *phydev = ugeth->phydev;
+       struct phy_device *phydev = netdev->phydev;
 
        if (!phydev)
                return -ENODEV;
@@ -118,8 +117,7 @@ static int
 uec_set_ksettings(struct net_device *netdev,
                  const struct ethtool_link_ksettings *cmd)
 {
-       struct ucc_geth_private *ugeth = netdev_priv(netdev);
-       struct phy_device *phydev = ugeth->phydev;
+       struct phy_device *phydev = netdev->phydev;
 
        if (!phydev)
                return -ENODEV;
@@ -132,8 +130,10 @@ uec_get_pauseparam(struct net_device *netdev,
                      struct ethtool_pauseparam *pause)
 {
        struct ucc_geth_private *ugeth = netdev_priv(netdev);
+       struct phy_device *phydev = netdev->phydev;
 
-       pause->autoneg = ugeth->phydev->autoneg;
+       if (phydev)
+               pause->autoneg = phydev->autoneg;
 
        if (ugeth->ug_info->receiveFlowControl)
                pause->rx_pause = 1;
@@ -146,12 +146,13 @@ uec_set_pauseparam(struct net_device *netdev,
                      struct ethtool_pauseparam *pause)
 {
        struct ucc_geth_private *ugeth = netdev_priv(netdev);
+       struct phy_device *phydev = netdev->phydev;
        int ret = 0;
 
        ugeth->ug_info->receiveFlowControl = pause->rx_pause;
        ugeth->ug_info->transmitFlowControl = pause->tx_pause;
 
-       if (ugeth->phydev->autoneg) {
+       if (phydev && phydev->autoneg) {
                if (netif_running(netdev)) {
                        /* FIXME: automatically restart */
                        netdev_info(netdev, "Please re-open the interface\n");
@@ -343,7 +344,7 @@ uec_get_drvinfo(struct net_device *netdev,
 static void uec_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
        struct ucc_geth_private *ugeth = netdev_priv(netdev);
-       struct phy_device *phydev = ugeth->phydev;
+       struct phy_device *phydev = netdev->phydev;
 
        if (phydev && phydev->irq)
                wol->supported |= WAKE_PHY;
@@ -356,7 +357,7 @@ static void uec_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 static int uec_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
        struct ucc_geth_private *ugeth = netdev_priv(netdev);
-       struct phy_device *phydev = ugeth->phydev;
+       struct phy_device *phydev = netdev->phydev;
 
        if (wol->wolopts & ~(WAKE_PHY | WAKE_MAGIC))
                return -EINVAL;