Commit b07bc55c authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Paolo Abeni
Browse files

net: ravb: Simplify ravb_suspend() 



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: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 76fd52c1

drivers/net/ethernet/renesas/ravb_main.c

+6 −7
Original line number Diff line number Diff line
@@ -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: