From: Minghao Chi <[email protected]>
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 <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
---
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
On 12/04/2022 11:28, [email protected] wrote:
> From: Minghao Chi <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
> ---
> 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 <[email protected]>
--
Best regards,
Grygorii, Ukraine
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <[email protected]>:
On Tue, 12 Apr 2022 08:28:47 +0000 you wrote:
> From: Minghao Chi <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
>
> [...]
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