Commit 168f7a16 authored by Harini Katakam's avatar Harini Katakam Committed by David S. Miller
Browse files

net: phy: gmii2rgmii: Dont use priv field in phy device 



Use set/get drv data in phydev's mdio device instead. Phy device priv
field maybe used by the external phy driver and should not be
overwritten.

Signed-off-by: default avatarHarini Katakam <harini.katakam@xilinx.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36b1a2fc

drivers/net/phy/xilinx_gmii2rgmii.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ struct gmii2rgmii { 




static int xgmiitorgmii_read_status(struct phy_device *phydev)

static int xgmiitorgmii_read_status(struct phy_device *phydev)

{

{

	struct gmii2rgmii *priv = phydev->priv;

	struct gmii2rgmii *priv = mdiodev_get_drvdata(&phydev->mdio);

	struct mii_bus *bus = priv->mdio->bus;

	struct mii_bus *bus = priv->mdio->bus;

	int addr = priv->mdio->addr;

	int addr = priv->mdio->addr;

	u16 val = 0;

	u16 val = 0;
@@ -90,7 +90,7 @@ static int xgmiitorgmii_probe(struct mdio_device *mdiodev) 
	memcpy(&priv->conv_phy_drv, priv->phy_dev->drv,

	memcpy(&priv->conv_phy_drv, priv->phy_dev->drv,

	       sizeof(struct phy_driver));

	       sizeof(struct phy_driver));

	priv->conv_phy_drv.read_status = xgmiitorgmii_read_status;

	priv->conv_phy_drv.read_status = xgmiitorgmii_read_status;

	priv->phy_dev->priv = priv;

	mdiodev_set_drvdata(&priv->phy_dev->mdio, priv);

	priv->phy_dev->drv = &priv->conv_phy_drv;

	priv->phy_dev->drv = &priv->conv_phy_drv;





	return 0;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE