iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: ravb: Simplify ravb_suspend()

Browse Source 
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 separate call in
ravb_suspend(). Instead, move it to ravb_wol_setup(). In this way the
resulting code is cleaner.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Claudiu Beznea 2024-02-02 10:41:35 +02:00 committed by Paolo Abeni
parent 76fd52c100
commit b07bc55cbb
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/renesas/ravb_main.c
View File

@ -2929,6 +2929,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);
}
@ -2961,14 +2964,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: