From a23348740ccdf5a1fa7967ec231e337209c7cd51 Mon Sep 17 00:00:00 2001 From: Harini Katakam Date: Fri, 5 Jul 2019 16:24:35 +0530 Subject: [PATCH] net: gmii2rgmii: Switch priv field in mdio device structure 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 Signed-off-by: Radhey Shyam Pandey --- drivers/net/phy/xilinx_gmii2rgmii.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index 2a98f1823f9a4f..8824d6b07174fc 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -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; @@ -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;