mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

net: stmmac: stmmac_main: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Minghao Chi 2022-04-13 09:38:01 +00:00 committed by David S. Miller
parent c557a9ae49
commit 85648865bb
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View file

@ -3643,11 +3643,9 @@ static int stmmac_open(struct net_device *dev)
u32 chan;
int ret;
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;
}
if (priv->hw->pcs != STMMAC_PCS_TBI &&
priv->hw->pcs != STMMAC_PCS_RTBI &&
@ -5886,11 +5884,9 @@ static int stmmac_set_mac_address(struct net_device *ndev, void *addr)
struct stmmac_priv *priv = netdev_priv(ndev);
int ret = 0;
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;
}
ret = eth_mac_addr(ndev, addr);
if (ret)
@ -6220,11 +6216,9 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
bool is_double = false;
int ret;
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;
}
if (be16_to_cpu(proto) == ETH_P_8021AD)
is_double = true;