hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: ethernet: tc35815: 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>
This commit is contained in:
Philippe Reynes 2016-07-14 15:20:46 +02:00 committed by David S. Miller
parent 02a198777e
commit a4fc549af8
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/ethernet/toshiba/tc35815.c
View File

@ -405,7 +405,6 @@ struct tc35815_local {
spinlock_t rx_lock; spinlock_t rx_lock;
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
struct phy_device *phy_dev;
int duplex; int duplex;
int speed; int speed;
int link; int link;
@ -539,7 +538,7 @@ static int tc_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 val)
static void tc_handle_link_change(struct net_device *dev) static void tc_handle_link_change(struct net_device *dev)
{ {
struct tc35815_local *lp = netdev_priv(dev); struct tc35815_local *lp = netdev_priv(dev);
struct phy_device *phydev = lp->phy_dev; struct phy_device *phydev = dev->phydev;
unsigned long flags; unsigned long flags;
int status_change = 0; int status_change = 0;
@ -645,7 +644,6 @@ static int tc_mii_probe(struct net_device *dev)
lp->link = 0; lp->link = 0;
lp->speed = 0; lp->speed = 0;
lp->duplex = -1; lp->duplex = -1;
lp->phy_dev = phydev;
return 0; return 0;
} }
@ -853,7 +851,7 @@ static void tc35815_remove_one(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct tc35815_local *lp = netdev_priv(dev); struct tc35815_local *lp = netdev_priv(dev);
phy_disconnect(lp->phy_dev); phy_disconnect(dev->phydev);
mdiobus_unregister(lp->mii_bus); mdiobus_unregister(lp->mii_bus);
mdiobus_free(lp->mii_bus); mdiobus_free(lp->mii_bus);
unregister_netdev(dev); unregister_netdev(dev);
@ -1143,8 +1141,8 @@ static void tc35815_restart(struct net_device *dev)
struct tc35815_local *lp = netdev_priv(dev); struct tc35815_local *lp = netdev_priv(dev);
int ret; int ret;
if (lp->phy_dev) { if (dev->phydev) {
ret = phy_init_hw(lp->phy_dev); ret = phy_init_hw(dev->phydev);
if (ret) if (ret)
printk(KERN_ERR "%s: PHY init failed.\n", dev->name); printk(KERN_ERR "%s: PHY init failed.\n", dev->name);
} }
@ -1236,7 +1234,7 @@ tc35815_open(struct net_device *dev)
netif_carrier_off(dev); netif_carrier_off(dev);
/* schedule a link state check */ /* schedule a link state check */
phy_start(lp->phy_dev); phy_start(dev->phydev);
/* We are now ready to accept transmit requeusts from /* We are now ready to accept transmit requeusts from
* the queueing layer of the networking. * the queueing layer of the networking.
@ -1819,8 +1817,8 @@ tc35815_close(struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
napi_disable(&lp->napi); napi_disable(&lp->napi);
if (lp->phy_dev) if (dev->phydev)
phy_stop(lp->phy_dev); phy_stop(dev->phydev);
cancel_work_sync(&lp->restart_work); cancel_work_sync(&lp->restart_work);
/* Flush the Tx and disable Rx here. */ /* Flush the Tx and disable Rx here. */
@ -1948,20 +1946,16 @@ static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *
static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct tc35815_local *lp = netdev_priv(dev); if (!dev->phydev)
if (!lp->phy_dev)
return -ENODEV; return -ENODEV;
return phy_ethtool_gset(lp->phy_dev, cmd); return phy_ethtool_gset(dev->phydev, cmd);
} }
static int tc35815_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int tc35815_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct tc35815_local *lp = netdev_priv(dev); if (!dev->phydev)
if (!lp->phy_dev)
return -ENODEV; return -ENODEV;
return phy_ethtool_sset(lp->phy_dev, cmd); return phy_ethtool_sset(dev->phydev, cmd);
} }
static u32 tc35815_get_msglevel(struct net_device *dev) static u32 tc35815_get_msglevel(struct net_device *dev)
@ -2025,13 +2019,11 @@ static const struct ethtool_ops tc35815_ethtool_ops = {
static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct tc35815_local *lp = netdev_priv(dev);
if (!netif_running(dev)) if (!netif_running(dev))
return -EINVAL; return -EINVAL;
if (!lp->phy_dev) if (!dev->phydev)
return -ENODEV; return -ENODEV;
return phy_mii_ioctl(lp->phy_dev, rq, cmd); return phy_mii_ioctl(dev->phydev, rq, cmd);
} }
static void tc35815_chip_reset(struct net_device *dev) static void tc35815_chip_reset(struct net_device *dev)
@ -2116,7 +2108,7 @@ static void tc35815_chip_init(struct net_device *dev)
if (lp->chiptype == TC35815_TX4939) if (lp->chiptype == TC35815_TX4939)
txctl &= ~Tx_EnLCarr; txctl &= ~Tx_EnLCarr;
/* WORKAROUND: ignore LostCrS in full duplex operation */ /* WORKAROUND: ignore LostCrS in full duplex operation */
if (!lp->phy_dev || !lp->link || lp->duplex == DUPLEX_FULL) if (!dev->phydev || !lp->link || lp->duplex == DUPLEX_FULL)
txctl &= ~Tx_EnLCarr; txctl &= ~Tx_EnLCarr;
tc_writel(txctl, &tr->Tx_Ctl); tc_writel(txctl, &tr->Tx_Ctl);
} }
@ -2132,8 +2124,8 @@ static int tc35815_suspend(struct pci_dev *pdev, pm_message_t state)
if (!netif_running(dev)) if (!netif_running(dev))
return 0; return 0;
netif_device_detach(dev); netif_device_detach(dev);
if (lp->phy_dev) if (dev->phydev)
phy_stop(lp->phy_dev); phy_stop(dev->phydev);
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
tc35815_chip_reset(dev); tc35815_chip_reset(dev);
spin_unlock_irqrestore(&lp->lock, flags); spin_unlock_irqrestore(&lp->lock, flags);
@ -2144,7 +2136,6 @@ static int tc35815_suspend(struct pci_dev *pdev, pm_message_t state)
static int tc35815_resume(struct pci_dev *pdev) static int tc35815_resume(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct tc35815_local *lp = netdev_priv(dev);
pci_restore_state(pdev); pci_restore_state(pdev);
if (!netif_running(dev)) if (!netif_running(dev))
@ -2152,8 +2143,8 @@ static int tc35815_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, PCI_D0); pci_set_power_state(pdev, PCI_D0);
tc35815_restart(dev); tc35815_restart(dev);
netif_carrier_off(dev); netif_carrier_off(dev);
if (lp->phy_dev) if (dev->phydev)
phy_start(lp->phy_dev); phy_start(dev->phydev);
netif_device_attach(dev); netif_device_attach(dev);
return 0; return 0;
} }