korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 20:04:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: ethernet: lpc_eth: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes 2016-06-28 23:59:44 +02:00 committed by David S. Miller
parent 8a6e9c6703
commit f786f3564c
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/nxp/lpc_eth.c
View File

@ -425,7 +425,6 @@ struct netdata_local {
unsigned int last_tx_idx; unsigned int last_tx_idx;
unsigned int num_used_tx_buffs; unsigned int num_used_tx_buffs;
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
struct phy_device *phy_dev;
struct clk *clk; struct clk *clk;
dma_addr_t dma_buff_base_p; dma_addr_t dma_buff_base_p;
void *dma_buff_base_v; void *dma_buff_base_v;
@ -750,7 +749,7 @@ static int lpc_mdio_reset(struct mii_bus *bus)
static void lpc_handle_link_change(struct net_device *ndev) static void lpc_handle_link_change(struct net_device *ndev)
{ {
struct netdata_local *pldat = netdev_priv(ndev); struct netdata_local *pldat = netdev_priv(ndev);
struct phy_device *phydev = pldat->phy_dev; struct phy_device *phydev = ndev->phydev;
unsigned long flags; unsigned long flags;
bool status_change = false; bool status_change = false;
@ -814,7 +813,6 @@ static int lpc_mii_probe(struct net_device *ndev)
pldat->link = 0; pldat->link = 0;
pldat->speed = 0; pldat->speed = 0;
pldat->duplex = -1; pldat->duplex = -1;
pldat->phy_dev = phydev;
phy_attached_info(phydev); phy_attached_info(phydev);
@ -1048,8 +1046,8 @@ static int lpc_eth_close(struct net_device *ndev)
napi_disable(&pldat->napi); napi_disable(&pldat->napi);
netif_stop_queue(ndev); netif_stop_queue(ndev);
if (pldat->phy_dev) if (ndev->phydev)
phy_stop(pldat->phy_dev); phy_stop(ndev->phydev);
spin_lock_irqsave(&pldat->lock, flags); spin_lock_irqsave(&pldat->lock, flags);
__lpc_eth_reset(pldat); __lpc_eth_reset(pldat);
@ -1186,7 +1184,7 @@ static void lpc_eth_set_multicast_list(struct net_device *ndev)
static int lpc_eth_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) static int lpc_eth_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
{ {
struct netdata_local *pldat = netdev_priv(ndev); struct netdata_local *pldat = netdev_priv(ndev);
struct phy_device *phydev = pldat->phy_dev; struct phy_device *phydev = ndev->phydev;
if (!netif_running(ndev)) if (!netif_running(ndev))
return -EINVAL; return -EINVAL;
@ -1207,14 +1205,14 @@ static int lpc_eth_open(struct net_device *ndev)
__lpc_eth_clock_enable(pldat, true); __lpc_eth_clock_enable(pldat, true);
/* Suspended PHY makes LPC ethernet core block, so resume now */ /* Suspended PHY makes LPC ethernet core block, so resume now */
phy_resume(pldat->phy_dev); phy_resume(ndev->phydev);
/* Reset and initialize */ /* Reset and initialize */
__lpc_eth_reset(pldat); __lpc_eth_reset(pldat);
__lpc_eth_init(pldat); __lpc_eth_init(pldat);
/* schedule a link state check */ /* schedule a link state check */
phy_start(pldat->phy_dev); phy_start(ndev->phydev);
netif_start_queue(ndev); netif_start_queue(ndev);
napi_enable(&pldat->napi); napi_enable(&pldat->napi);
@ -1250,8 +1248,7 @@ static void lpc_eth_ethtool_setmsglevel(struct net_device *ndev, u32 level)
static int lpc_eth_ethtool_getsettings(struct net_device *ndev, static int lpc_eth_ethtool_getsettings(struct net_device *ndev,
struct ethtool_cmd *cmd) struct ethtool_cmd *cmd)
{ {
struct netdata_local *pldat = netdev_priv(ndev); struct phy_device *phydev = ndev->phydev;
struct phy_device *phydev = pldat->phy_dev;
if (!phydev) if (!phydev)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -1262,8 +1259,7 @@ static int lpc_eth_ethtool_getsettings(struct net_device *ndev,
static int lpc_eth_ethtool_setsettings(struct net_device *ndev, static int lpc_eth_ethtool_setsettings(struct net_device *ndev,
struct ethtool_cmd *cmd) struct ethtool_cmd *cmd)
{ {
struct netdata_local *pldat = netdev_priv(ndev); struct phy_device *phydev = ndev->phydev;
struct phy_device *phydev = pldat->phy_dev;
if (!phydev) if (!phydev)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -1460,7 +1456,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
netdev_info(ndev, "LPC mac at 0x%08x irq %d\n", netdev_info(ndev, "LPC mac at 0x%08x irq %d\n",
res->start, ndev->irq); res->start, ndev->irq);
phydev = pldat->phy_dev; phydev = ndev->phydev;
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
device_set_wakeup_enable(&pdev->dev, 0); device_set_wakeup_enable(&pdev->dev, 0);