2023-12-15 11:48:10

by Claudiu

Subject: [PATCH net-next v2 14/21] net: ravb: Simplify ravb_suspend()

From: Claudiu Beznea <[email protected]>

As ravb_close() contains now the call to ravb_ptp_stop() for both ccc_gac
and gPTP aware platforms, there is no need to keep the separated call in
ravb_suspend(). Instead, move it to ravb_wol_setup(). In this way the
resulting code is cleaner.

Signed-off-by: Claudiu Beznea <[email protected]>
---

Changes in v2:
- none; this patch is new

drivers/net/ethernet/renesas/ravb_main.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 31a1f8a83652..16450bf241cd 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2968,6 +2968,9 @@ static int ravb_wol_setup(struct net_device *ndev)
/* Enable MagicPacket */
ravb_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE);

+ if (priv->info->ccc_gac)
+ ravb_ptp_stop(ndev);
+
return enable_irq_wake(priv->emac_irq);
}

@@ -3000,14 +3003,10 @@ static int ravb_suspend(struct device *dev)
netif_device_detach(ndev);

if (priv->wol_enabled)
- ret = ravb_wol_setup(ndev);
- else
- ret = ravb_close(ndev);
+ return ravb_wol_setup(ndev);

- if (priv->info->ccc_gac)
- ravb_ptp_stop(ndev);
-
- if (priv->wol_enabled)
+ ret = ravb_close(ndev);
+ if (ret)
return ret;

reset_assert:
--
2.39.2

2023-12-16 17:48:17

by Sergey Shtylyov

Subject: Re: [PATCH net-next v2 14/21] net: ravb: Simplify ravb_suspend()

On 12/14/23 2:45 PM, Claudiu wrote:

> From: Claudiu Beznea <[email protected]>
>
> As ravb_close() contains now the call to ravb_ptp_stop() for both ccc_gac
> and gPTP aware platforms, there is no need to keep the separated call in

Separate.

> ravb_suspend(). Instead, move it to ravb_wol_setup(). In this way the
> resulting code is cleaner.
>
> Signed-off-by: Claudiu Beznea <[email protected]>

Reviewed-by: Sergey Shtylyov <[email protected]>

[...]

MBR, Sergey