Commit 85648865 authored by Minghao Chi's avatar Minghao Chi Committed by David S. Miller

net: stmmac: stmmac_main: using pm_runtime_resume_and_get instead of pm_runtime_get_sync

Using pm_runtime_resume_and_get is more appropriate
for simplifing code
Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarMinghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c557a9ae
...@@ -3643,11 +3643,9 @@ static int stmmac_open(struct net_device *dev) ...@@ -3643,11 +3643,9 @@ static int stmmac_open(struct net_device *dev)
u32 chan; u32 chan;
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;
}
if (priv->hw->pcs != STMMAC_PCS_TBI && if (priv->hw->pcs != STMMAC_PCS_TBI &&
priv->hw->pcs != STMMAC_PCS_RTBI && priv->hw->pcs != STMMAC_PCS_RTBI &&
...@@ -5886,11 +5884,9 @@ static int stmmac_set_mac_address(struct net_device *ndev, void *addr) ...@@ -5886,11 +5884,9 @@ static int stmmac_set_mac_address(struct net_device *ndev, void *addr)
struct stmmac_priv *priv = netdev_priv(ndev); struct stmmac_priv *priv = netdev_priv(ndev);
int ret = 0; int ret = 0;
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;
}
ret = eth_mac_addr(ndev, addr); ret = eth_mac_addr(ndev, addr);
if (ret) if (ret)
...@@ -6220,11 +6216,9 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi ...@@ -6220,11 +6216,9 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
bool is_double = false; bool is_double = false;
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;
}
if (be16_to_cpu(proto) == ETH_P_8021AD) if (be16_to_cpu(proto) == ETH_P_8021AD)
is_double = true; is_double = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment