Skip to content

Commit

Permalink
net: gmii2rgmii: Switch priv field in mdio device structure
Browse files Browse the repository at this point in the history
Use the priv field in mdio device structure instead of the one in
phy device structure. The phy device priv field may be used by the
external phy driver and should not be overwritten. Also remove the
check for phy priv field as it is no longer used.

Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
  • Loading branch information
harini-katakam authored and radheyxilinx committed Jul 24, 2019
1 parent 81f7424 commit a233487
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/net/phy/xilinx_gmii2rgmii.c
Expand Up @@ -38,7 +38,7 @@ struct gmii2rgmii {

static int xgmiitorgmii_read_status(struct phy_device *phydev)
{
struct gmii2rgmii *priv = phydev->priv;
struct gmii2rgmii *priv = phydev->mdio.priv;
struct mii_bus *bus = priv->mdio->bus;
int addr = priv->mdio->addr;
u16 val = 0;
Expand Down Expand Up @@ -95,17 +95,12 @@ static int xgmiitorgmii_probe(struct mdio_device *mdiodev)
return -EPROBE_DEFER;
}

if (priv->phy_dev->priv) {
dev_err(dev, "phydev has a priv field, cannot attach\n");
return -EFAULT;
}

priv->mdio = mdiodev;
priv->phy_drv = priv->phy_dev->drv;
memcpy(&priv->conv_phy_drv, priv->phy_dev->drv,
sizeof(struct phy_driver));
priv->conv_phy_drv.read_status = xgmiitorgmii_read_status;
priv->phy_dev->priv = priv;
priv->phy_dev->mdio.priv = priv;
priv->phy_dev->drv = &priv->conv_phy_drv;

return 0;
Expand Down

0 comments on commit a233487

Please sign in to comment.