Skip to content

Commit

Permalink
net: ethernet: renesas: sh_eth: use phydev from struct net_device
Browse files Browse the repository at this point in the history
The private structure contain a pointer to phydev, but the structure
net_device already contain such pointer. So we can remove the pointer
phy_dev 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>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Philippe Reynes authored and David S. Miller committed Aug 11, 2016
1 parent 05b8ad2 commit 9fd0375
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
29 changes: 12 additions & 17 deletions drivers/net/ethernet/renesas/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,7 @@ static int sh_eth_poll(struct napi_struct *napi, int budget)
static void sh_eth_adjust_link(struct net_device *ndev)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
struct phy_device *phydev = mdp->phydev;
struct phy_device *phydev = ndev->phydev;
int new_state = 0;

if (phydev->link) {
Expand Down Expand Up @@ -1800,22 +1800,19 @@ static int sh_eth_phy_init(struct net_device *ndev)

phy_attached_info(phydev);

mdp->phydev = phydev;

return 0;
}

/* PHY control start function */
static int sh_eth_phy_start(struct net_device *ndev)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
int ret;

ret = sh_eth_phy_init(ndev);
if (ret)
return ret;

phy_start(mdp->phydev);
phy_start(ndev->phydev);

return 0;
}
Expand All @@ -1827,11 +1824,11 @@ static int sh_eth_get_settings(struct net_device *ndev,
unsigned long flags;
int ret;

if (!mdp->phydev)
if (!ndev->phydev)
return -ENODEV;

spin_lock_irqsave(&mdp->lock, flags);
ret = phy_ethtool_gset(mdp->phydev, ecmd);
ret = phy_ethtool_gset(ndev->phydev, ecmd);
spin_unlock_irqrestore(&mdp->lock, flags);

return ret;
Expand All @@ -1844,15 +1841,15 @@ static int sh_eth_set_settings(struct net_device *ndev,
unsigned long flags;
int ret;

if (!mdp->phydev)
if (!ndev->phydev)
return -ENODEV;

spin_lock_irqsave(&mdp->lock, flags);

/* disable tx and rx */
sh_eth_rcv_snd_disable(ndev);

ret = phy_ethtool_sset(mdp->phydev, ecmd);
ret = phy_ethtool_sset(ndev->phydev, ecmd);
if (ret)
goto error_exit;

Expand Down Expand Up @@ -2067,11 +2064,11 @@ static int sh_eth_nway_reset(struct net_device *ndev)
unsigned long flags;
int ret;

if (!mdp->phydev)
if (!ndev->phydev)
return -ENODEV;

spin_lock_irqsave(&mdp->lock, flags);
ret = phy_start_aneg(mdp->phydev);
ret = phy_start_aneg(ndev->phydev);
spin_unlock_irqrestore(&mdp->lock, flags);

return ret;
Expand Down Expand Up @@ -2408,10 +2405,9 @@ static int sh_eth_close(struct net_device *ndev)
sh_eth_dev_exit(ndev);

/* PHY Disconnect */
if (mdp->phydev) {
phy_stop(mdp->phydev);
phy_disconnect(mdp->phydev);
mdp->phydev = NULL;
if (ndev->phydev) {
phy_stop(ndev->phydev);
phy_disconnect(ndev->phydev);
}

free_irq(ndev->irq, ndev);
Expand All @@ -2429,8 +2425,7 @@ static int sh_eth_close(struct net_device *ndev)
/* ioctl to device function */
static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
struct phy_device *phydev = mdp->phydev;
struct phy_device *phydev = ndev->phydev;

if (!netif_running(ndev))
return -EINVAL;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/ethernet/renesas/sh_eth.h
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ struct sh_eth_private {
/* MII transceiver section. */
u32 phy_id; /* PHY ID */
struct mii_bus *mii_bus; /* MDIO bus control */
struct phy_device *phydev; /* PHY device control */
int link;
phy_interface_t phy_interface;
int msg_enable;
Expand Down

0 comments on commit 9fd0375

Please sign in to comment.