mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
net: ethernet: greth: 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:
parent
0d5704bf4e
commit
65752dda4b
2 changed files with 11 additions and 13 deletions
|
@ -1107,8 +1107,7 @@ static void greth_set_msglevel(struct net_device *dev, u32 value)
|
||||||
}
|
}
|
||||||
static int greth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
static int greth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||||
{
|
{
|
||||||
struct greth_private *greth = netdev_priv(dev);
|
struct phy_device *phy = dev->phydev;
|
||||||
struct phy_device *phy = greth->phy;
|
|
||||||
|
|
||||||
if (!phy)
|
if (!phy)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -1118,8 +1117,7 @@ static int greth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||||
|
|
||||||
static int greth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
static int greth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||||
{
|
{
|
||||||
struct greth_private *greth = netdev_priv(dev);
|
struct phy_device *phy = dev->phydev;
|
||||||
struct phy_device *phy = greth->phy;
|
|
||||||
|
|
||||||
if (!phy)
|
if (!phy)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -1224,7 +1222,7 @@ static int greth_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
|
||||||
static void greth_link_change(struct net_device *dev)
|
static void greth_link_change(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct greth_private *greth = netdev_priv(dev);
|
struct greth_private *greth = netdev_priv(dev);
|
||||||
struct phy_device *phydev = greth->phy;
|
struct phy_device *phydev = dev->phydev;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int status_change = 0;
|
int status_change = 0;
|
||||||
u32 ctrl;
|
u32 ctrl;
|
||||||
|
@ -1307,7 +1305,6 @@ static int greth_mdio_probe(struct net_device *dev)
|
||||||
greth->link = 0;
|
greth->link = 0;
|
||||||
greth->speed = 0;
|
greth->speed = 0;
|
||||||
greth->duplex = -1;
|
greth->duplex = -1;
|
||||||
greth->phy = phy;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1325,6 +1322,7 @@ static int greth_mdio_init(struct greth_private *greth)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned long timeout;
|
unsigned long timeout;
|
||||||
|
struct net_device *ndev = greth->netdev;
|
||||||
|
|
||||||
greth->mdio = mdiobus_alloc();
|
greth->mdio = mdiobus_alloc();
|
||||||
if (!greth->mdio) {
|
if (!greth->mdio) {
|
||||||
|
@ -1349,15 +1347,16 @@ static int greth_mdio_init(struct greth_private *greth)
|
||||||
goto unreg_mdio;
|
goto unreg_mdio;
|
||||||
}
|
}
|
||||||
|
|
||||||
phy_start(greth->phy);
|
phy_start(ndev->phydev);
|
||||||
|
|
||||||
/* If Ethernet debug link is used make autoneg happen right away */
|
/* If Ethernet debug link is used make autoneg happen right away */
|
||||||
if (greth->edcl && greth_edcl == 1) {
|
if (greth->edcl && greth_edcl == 1) {
|
||||||
phy_start_aneg(greth->phy);
|
phy_start_aneg(ndev->phydev);
|
||||||
timeout = jiffies + 6*HZ;
|
timeout = jiffies + 6*HZ;
|
||||||
while (!phy_aneg_done(greth->phy) && time_before(jiffies, timeout)) {
|
while (!phy_aneg_done(ndev->phydev) &&
|
||||||
|
time_before(jiffies, timeout)) {
|
||||||
}
|
}
|
||||||
phy_read_status(greth->phy);
|
phy_read_status(ndev->phydev);
|
||||||
greth_link_change(greth->netdev);
|
greth_link_change(greth->netdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1569,8 +1568,8 @@ static int greth_of_remove(struct platform_device *of_dev)
|
||||||
|
|
||||||
dma_free_coherent(&of_dev->dev, 1024, greth->tx_bd_base, greth->tx_bd_base_phys);
|
dma_free_coherent(&of_dev->dev, 1024, greth->tx_bd_base, greth->tx_bd_base_phys);
|
||||||
|
|
||||||
if (greth->phy)
|
if (ndev->phydev)
|
||||||
phy_stop(greth->phy);
|
phy_stop(ndev->phydev);
|
||||||
mdiobus_unregister(greth->mdio);
|
mdiobus_unregister(greth->mdio);
|
||||||
|
|
||||||
unregister_netdev(ndev);
|
unregister_netdev(ndev);
|
||||||
|
|
|
@ -123,7 +123,6 @@ struct greth_private {
|
||||||
struct napi_struct napi;
|
struct napi_struct napi;
|
||||||
spinlock_t devlock;
|
spinlock_t devlock;
|
||||||
|
|
||||||
struct phy_device *phy;
|
|
||||||
struct mii_bus *mdio;
|
struct mii_bus *mdio;
|
||||||
unsigned int link;
|
unsigned int link;
|
||||||
unsigned int speed;
|
unsigned int speed;
|
||||||
|
|
Loading…
Reference in a new issue