Commit ec0b1eee authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: mdio: update runtime PM 



Commit 3c7826d0 ("net: stmmac: Separate C22 and C45 transactions
for xgmac") missed a change that happened in commit e2d0acd4
("net: stmmac: using pm_runtime_resume_and_get instead of
pm_runtime_get_sync").

Update the two clause 45 functions that didn't get switched to
pm_runtime_resume_and_get().

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/E1urv09-00000000gJ1-3SxO@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c85ae024

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+4 −8
Original line number Diff line number Diff line
@@ -303,11 +303,9 @@ static int stmmac_mdio_read_c45(struct mii_bus *bus, int phyaddr, int devad, 
	u32 value = MII_BUSY;

	int data = 0;



	data = pm_runtime_get_sync(priv->device);

	if (data < 0) {

		pm_runtime_put_noidle(priv->device);

	data = pm_runtime_resume_and_get(priv->device);

	if (data < 0)

		return data;

	}



	value |= (phyaddr << priv->hw->mii.addr_shift)

		& priv->hw->mii.addr_mask;
@@ -399,11 +397,9 @@ static int stmmac_mdio_write_c45(struct mii_bus *bus, int phyaddr, 
	int ret, data = phydata;

	u32 value = MII_BUSY;



	ret = pm_runtime_get_sync(priv->device);

	if (ret < 0) {

		pm_runtime_put_noidle(priv->device);

	ret = pm_runtime_resume_and_get(priv->device);

	if (ret < 0)

		return ret;

	}



	value |= (phyaddr << priv->hw->mii.addr_shift)

		& priv->hw->mii.addr_mask;