Commit 2240514c authored by Minghao Chi's avatar Minghao Chi Committed by David S. Miller
Browse files

net: ethernet: ti: am65-cpsw-nuss: 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 1b0e8141

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+11 −22
Original line number Diff line number Diff line
@@ -173,11 +173,9 @@ static int am65_cpsw_nuss_ndo_slave_add_vid(struct net_device *ndev, 
	if (!netif_running(ndev) || !vid)

		return 0;



	ret = pm_runtime_get_sync(common->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(common->dev);

	ret = pm_runtime_resume_and_get(common->dev);

	if (ret < 0)

		return ret;

	}



	port_mask = BIT(port->port_id) | ALE_PORT_HOST;

	if (!vid)
@@ -203,11 +201,9 @@ static int am65_cpsw_nuss_ndo_slave_kill_vid(struct net_device *ndev, 
	if (!netif_running(ndev) || !vid)

		return 0;



	ret = pm_runtime_get_sync(common->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(common->dev);

	ret = pm_runtime_resume_and_get(common->dev);

	if (ret < 0)

		return ret;

	}



	dev_info(common->dev, "Removing vlan %d from vlan filter\n", vid);

	ret = cpsw_ale_del_vlan(common->ale, vid,
@@ -557,11 +553,9 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) 
	struct am65_cpsw_port *port = am65_ndev_to_port(ndev);

	int ret, i;



	ret = pm_runtime_get_sync(common->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(common->dev);

	ret = pm_runtime_resume_and_get(common->dev);

	if (ret < 0)

		return ret;

	}



	/* Notify the stack of the actual queue counts. */

	ret = netif_set_real_num_tx_queues(ndev, common->tx_ch_num);
@@ -1214,11 +1208,9 @@ static int am65_cpsw_nuss_ndo_slave_set_mac_address(struct net_device *ndev, 
	if (ret < 0)

		return ret;



	ret = pm_runtime_get_sync(common->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(common->dev);

	ret = pm_runtime_resume_and_get(common->dev);

	if (ret < 0)

		return ret;

	}



	cpsw_ale_del_ucast(common->ale, ndev->dev_addr,

			   HOST_PORT_NUM, 0, 0);
@@ -2692,9 +2684,8 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev) 
	common->bus_freq = clk_get_rate(clk);



	pm_runtime_enable(dev);

	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;

	}
@@ -2789,11 +2780,9 @@ static int am65_cpsw_nuss_remove(struct platform_device *pdev) 


	common = dev_get_drvdata(dev);



	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;

	}



	am65_cpsw_nuss_phylink_cleanup(common);

	am65_cpsw_unregister_devlink(common);