net: ethernet: ti: cpsw_new: use pm_runtime_resume_and_get() instead of pm_runtime_ge...

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>

diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
index dfa0a9c..0f31cb4 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -449,11 +449,9 @@ static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
        if (vid == cpsw->data.default_vlan)
                return 0;
 
-       ret = pm_runtime_get_sync(cpsw->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(cpsw->dev);
+       ret = pm_runtime_resume_and_get(cpsw->dev);
+       if (ret < 0)
                return ret;
-       }
 
        /* In dual EMAC, reserved VLAN id should not be used for
         * creating VLAN interfaces as this can break the dual
@@ -831,11 +829,9 @@ static int cpsw_ndo_open(struct net_device *ndev)
 
        dev_info(priv->dev, "starting ndev. mode: %s\n",
                 cpsw_is_switch_en(cpsw) ? "switch" : "dual_mac");
-       ret = pm_runtime_get_sync(cpsw->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(cpsw->dev);
+       ret = pm_runtime_resume_and_get(cpsw->dev);
+       if (ret < 0)
                return ret;
-       }
 
        /* Notify the stack of the actual queue counts. */
        ret = netif_set_real_num_tx_queues(ndev, cpsw->tx_ch_num);
@@ -987,11 +983,9 @@ static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
-       ret = pm_runtime_get_sync(cpsw->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(cpsw->dev);
+       ret = pm_runtime_resume_and_get(cpsw->dev);
+       if (ret < 0)
                return ret;
-       }
 
        vid = cpsw->slaves[slave_no].port_vlan;
        flags = ALE_VLAN | ALE_SECURE;
@@ -1026,11 +1020,9 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,
        if (vid == cpsw->data.default_vlan)
                return 0;
 
-       ret = pm_runtime_get_sync(cpsw->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(cpsw->dev);
+       ret = pm_runtime_resume_and_get(cpsw->dev);
+       if (ret < 0)
                return ret;
-       }
 
        /* reset the return code as pm_runtime_get_sync() can return
         * non zero values as well.
@@ -1920,9 +1912,8 @@ static int cpsw_probe(struct platform_device *pdev)
        /* Need to enable clocks with runtime PM api to access module
         * registers
         */
-       ret = pm_runtime_get_sync(dev);
+       ret = pm_runtime_resume_and_get(dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(dev);
                pm_runtime_disable(dev);
                return ret;
        }
@@ -2047,11 +2038,9 @@ static int cpsw_remove(struct platform_device *pdev)
        struct cpsw_common *cpsw = platform_get_drvdata(pdev);
        int ret;
 
-       ret = pm_runtime_get_sync(&pdev->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(&pdev->dev);
+       ret = pm_runtime_resume_and_get(&pdev->dev);
+       if (ret < 0)
                return ret;
-       }
 
        cpsw_unregister_notifiers(cpsw);
        cpsw_unregister_devlink(cpsw);