Re: [PATCH 1/2] net: ethernet: hisilicon: hns: use phydev from struct net_device

[David Miller]

From: Philippe Reynes 
Date: Tue, 20 Sep 2016 22:30:11 +0200

> 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 

Applied.

[PATCH 1/2] net: ethernet: hisilicon: hns: use phydev from struct net_device

[Philippe Reynes]

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 
---
 drivers/net/ethernet/hisilicon/hns/hns_enet.c|   23 ++-
 drivers/net/ethernet/hisilicon/hns/hns_enet.h|1 -
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c |   33 ++
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c 
b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index d7e1f8c..059aaed 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -994,10 +994,10 @@ static void hns_nic_adjust_link(struct net_device *ndev)
struct hnae_handle *h = priv->ae_handle;
int state = 1;
 
-   if (priv->phy) {
+   if (ndev->phydev) {
h->dev->ops->adjust_link(h, ndev->phydev->speed,
 ndev->phydev->duplex);
-   state = priv->phy->link;
+   state = ndev->phydev->link;
}
state = state && h->dev->ops->get_status(h);
 
@@ -1022,7 +1022,6 @@ static void hns_nic_adjust_link(struct net_device *ndev)
  */
 int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)
 {
-   struct hns_nic_priv *priv = netdev_priv(ndev);
struct phy_device *phy_dev = h->phy_dev;
int ret;
 
@@ -1046,8 +1045,6 @@ int hns_nic_init_phy(struct net_device *ndev, struct 
hnae_handle *h)
if (h->phy_if == PHY_INTERFACE_MODE_XGMII)
phy_dev->autoneg = false;
 
-   priv->phy = phy_dev;
-
return 0;
 }
 
@@ -1224,8 +1221,8 @@ static int hns_nic_net_up(struct net_device *ndev)
if (ret)
goto out_start_err;
 
-   if (priv->phy)
-   phy_start(priv->phy);
+   if (ndev->phydev)
+   phy_start(ndev->phydev);
 
clear_bit(NIC_STATE_DOWN, >state);
(void)mod_timer(>service_timer, jiffies + SERVICE_TIMER_HZ);
@@ -1259,8 +1256,8 @@ static void hns_nic_net_down(struct net_device *ndev)
netif_tx_disable(ndev);
priv->link = 0;
 
-   if (priv->phy)
-   phy_stop(priv->phy);
+   if (ndev->phydev)
+   phy_stop(ndev->phydev);
 
ops = priv->ae_handle->dev->ops;
 
@@ -1359,8 +1356,7 @@ static void hns_nic_net_timeout(struct net_device *ndev)
 static int hns_nic_do_ioctl(struct net_device *netdev, struct ifreq *ifr,
int cmd)
 {
-   struct hns_nic_priv *priv = netdev_priv(netdev);
-   struct phy_device *phy_dev = priv->phy;
+   struct phy_device *phy_dev = netdev->phydev;
 
if (!netif_running(netdev))
return -EINVAL;
@@ -2017,9 +2013,8 @@ static int hns_nic_dev_remove(struct platform_device 
*pdev)
hns_nic_uninit_ring_data(priv);
priv->ring_data = NULL;
 
-   if (priv->phy)
-   phy_disconnect(priv->phy);
-   priv->phy = NULL;
+   if (ndev->phydev)
+   phy_disconnect(ndev->phydev);
 
if (!IS_ERR_OR_NULL(priv->ae_handle))
hnae_put_handle(priv->ae_handle);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h 
b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
index 44bb301..5b412de 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
@@ -59,7 +59,6 @@ struct hns_nic_priv {
u32 port_id;
int phy_mode;
int phy_led_val;
-   struct phy_device *phy;
struct net_device *netdev;
struct device *dev;
struct hnae_handle *ae_handle;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c 
b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 5eb3245..0e2c174 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -48,9 +48,9 @@ static u32 hns_nic_get_link(struct net_device *net_dev)
 
h = priv->ae_handle;
 
-   if (priv->phy) {
-   if (!genphy_read_status(priv->phy))
-   link_stat = priv->phy->link;
+   if (net_dev->phydev) {
+   if (!genphy_read_status(net_dev->phydev))
+   link_stat = net_dev->phydev->link;
else
link_stat = 0;
}
@@ -67,8 +67,7 @@ static void hns_get_mdix_mode(struct net_device *net_dev,
  struct ethtool_cmd *cmd)
 {
int mdix_ctrl, mdix, retval, is_resolved;
-   struct hns_nic_priv *priv = netdev_priv(net_dev);
-   struct phy_device *phy_dev = priv->phy;
+   struct phy_device *phy_dev = net_dev->phydev;
 
if (!phy_dev || !phy_dev->mdio.bus) {
cmd->eth_tp_mdix_ctrl = ETH_TP_MDI_INVALID;
@@ -144,8 +143,8 @@