All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
@ 2022-04-12  8:28 cgel.zte
  2022-04-12  9:49 ` Grygorii Strashko
  2022-04-12 22:10 ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 3+ messages in thread
From: cgel.zte @ 2022-04-12  8:28 UTC (permalink / raw)
  To: grygorii.strashko
  Cc: davem, kuba, pabeni, linux-omap, netdev, linux-kernel,
	Minghao Chi, Zeal Robot

From: Minghao Chi <chi.minghao@zte.com.cn>

Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. This change is just to simplify the code, no
actual functional changes.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
---
 drivers/net/ethernet/ti/cpsw.c | 36 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 03575c017500..9f37b5b196a5 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -756,11 +756,9 @@ static int cpsw_ndo_open(struct net_device *ndev)
 	int ret;
 	u32 reg;
 
-	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;
-	}
 
 	netif_carrier_off(ndev);
 
@@ -968,11 +966,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;
-	}
 
 	if (cpsw->data.dual_emac) {
 		vid = cpsw->slaves[priv->emac_port].port_vlan;
@@ -1052,11 +1048,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;
-	}
 
 	if (cpsw->data.dual_emac) {
 		/* In dual EMAC, reserved VLAN id should not be used for
@@ -1090,11 +1084,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;
-	}
 
 	if (cpsw->data.dual_emac) {
 		int i;
@@ -1567,11 +1559,9 @@ 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);
-	if (ret < 0) {
-		pm_runtime_put_noidle(dev);
+	ret = pm_runtime_resume_and_get(dev);
+	if (ret < 0)
 		goto clean_runtime_disable_ret;
-	}
 
 	ret = cpsw_probe_dt(&cpsw->data, pdev);
 	if (ret)
@@ -1734,11 +1724,9 @@ static int cpsw_remove(struct platform_device *pdev)
 	struct cpsw_common *cpsw = platform_get_drvdata(pdev);
 	int i, 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;
-	}
 
 	for (i = 0; i < cpsw->data.slaves; i++)
 		if (cpsw->slaves[i].ndev)
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
  2022-04-12  8:28 [PATCH] net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync cgel.zte
@ 2022-04-12  9:49 ` Grygorii Strashko
  2022-04-12 22:10 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: Grygorii Strashko @ 2022-04-12  9:49 UTC (permalink / raw)
  To: cgel.zte
  Cc: davem, kuba, pabeni, linux-omap, netdev, linux-kernel,
	Minghao Chi, Zeal Robot



On 12/04/2022 11:28, cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
> 
> Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
> pm_runtime_put_noidle. This change is just to simplify the code, no
> actual functional changes.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> ---
>   drivers/net/ethernet/ti/cpsw.c | 36 ++++++++++++----------------------
>   1 file changed, 12 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
> index 03575c017500..9f37b5b196a5 100644
> --- a/drivers/net/ethernet/ti/cpsw.c
> +++ b/drivers/net/ethernet/ti/cpsw.c
> @@ -756,11 +756,9 @@ static int cpsw_ndo_open(struct net_device *ndev)
>   	int ret;
>   	u32 reg;
>   
> -	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;
> -	}
>   
>   	netif_carrier_off(ndev);
>   
> @@ -968,11 +966,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;
> -	}
>   
>   	if (cpsw->data.dual_emac) {
>   		vid = cpsw->slaves[priv->emac_port].port_vlan;
> @@ -1052,11 +1048,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;
> -	}
>   
>   	if (cpsw->data.dual_emac) {
>   		/* In dual EMAC, reserved VLAN id should not be used for
> @@ -1090,11 +1084,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;
> -	}
>   
>   	if (cpsw->data.dual_emac) {
>   		int i;
> @@ -1567,11 +1559,9 @@ 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);
> -	if (ret < 0) {
> -		pm_runtime_put_noidle(dev);
> +	ret = pm_runtime_resume_and_get(dev);
> +	if (ret < 0)
>   		goto clean_runtime_disable_ret;
> -	}
>   
>   	ret = cpsw_probe_dt(&cpsw->data, pdev);
>   	if (ret)
> @@ -1734,11 +1724,9 @@ static int cpsw_remove(struct platform_device *pdev)
>   	struct cpsw_common *cpsw = platform_get_drvdata(pdev);
>   	int i, 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;
> -	}
>   
>   	for (i = 0; i < cpsw->data.slaves; i++)
>   		if (cpsw->slaves[i].ndev)

Thank you.
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>

-- 
Best regards,
Grygorii, Ukraine

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
  2022-04-12  8:28 [PATCH] net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync cgel.zte
  2022-04-12  9:49 ` Grygorii Strashko
@ 2022-04-12 22:10 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-04-12 22:10 UTC (permalink / raw)
  To: CGEL
  Cc: grygorii.strashko, davem, kuba, pabeni, linux-omap, netdev,
	linux-kernel, chi.minghao, zealci

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 12 Apr 2022 08:28:47 +0000 you wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
> 
> Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
> pm_runtime_put_noidle. This change is just to simplify the code, no
> actual functional changes.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> 
> [...]

Here is the summary with links:
  - net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
    https://git.kernel.org/netdev/net-next/c/2e5b3d4cb16e

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-12 23:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-12  8:28 [PATCH] net: ethernet: ti: cpsw: using pm_runtime_resume_and_get instead of pm_runtime_get_sync cgel.zte
2022-04-12  9:49 ` Grygorii Strashko
2022-04-12 22:10 ` patchwork-bot+netdevbpf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.