iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: stmmac: using pm_runtime_resume_and_get instead of pm_runtime_get_sync

Browse Source 
Using pm_runtime_resume_and_get is more appropriate
for simplifing code

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Link: https://lore.kernel.org/r/20220408081250.2494588-1-chi.minghao@zte.com.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Minghao Chi
2022-04-08 08:12:50 +00:00
committed by Jakub Kicinski
parent 1cb9d3b618
commit e2d0acd40c
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View File

@ -88,11 +88,9 @@ static int stmmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
u32 tmp, addr, value = MII_XGMAC_BUSY; u32 tmp, addr, value = MII_XGMAC_BUSY;
int ret; int ret;
ret = pm_runtime_get_sync(priv->device); ret = pm_runtime_resume_and_get(priv->device);
if (ret < 0) { if (ret < 0)
pm_runtime_put_noidle(priv->device);
return ret; return ret;
}
/* Wait until any existing MII operation is complete */ /* Wait until any existing MII operation is complete */
if (readl_poll_timeout(priv->ioaddr + mii_data, tmp, if (readl_poll_timeout(priv->ioaddr + mii_data, tmp,
@ -156,11 +154,9 @@ static int stmmac_xgmac2_mdio_write(struct mii_bus *bus, int phyaddr,
u32 addr, tmp, value = MII_XGMAC_BUSY; u32 addr, tmp, value = MII_XGMAC_BUSY;
int ret; int ret;
ret = pm_runtime_get_sync(priv->device); ret = pm_runtime_resume_and_get(priv->device);
if (ret < 0) { if (ret < 0)
pm_runtime_put_noidle(priv->device);
return ret; return ret;
}
/* Wait until any existing MII operation is complete */ /* Wait until any existing MII operation is complete */
if (readl_poll_timeout(priv->ioaddr + mii_data, tmp, if (readl_poll_timeout(priv->ioaddr + mii_data, tmp,
@ -229,11 +225,9 @@ static int stmmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
int data = 0; int data = 0;
u32 v; u32 v;
data = pm_runtime_get_sync(priv->device); data = pm_runtime_resume_and_get(priv->device);
if (data < 0) { if (data < 0)
pm_runtime_put_noidle(priv->device);
return data; return data;
}
value |= (phyaddr << priv->hw->mii.addr_shift) value |= (phyaddr << priv->hw->mii.addr_shift)
& priv->hw->mii.addr_mask; & priv->hw->mii.addr_mask;
@ -297,11 +291,9 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
u32 value = MII_BUSY; u32 value = MII_BUSY;
u32 v; u32 v;
ret = pm_runtime_get_sync(priv->device); ret = pm_runtime_resume_and_get(priv->device);
if (ret < 0) { if (ret < 0)
pm_runtime_put_noidle(priv->device);
return ret; return ret;
}
value |= (phyaddr << priv->hw->mii.addr_shift) value |= (phyaddr << priv->hw->mii.addr_shift)
& priv->hw->mii.addr_mask; & priv->hw->mii.addr_mask;