diff mbox series

[6.1.y-cip,19/33] net: ravb: Simplify ravb_suspend()

Message ID	20240529081434.639519-20-claudiu.beznea.uj@bp.renesas.com (mailing list archive)
State	New
Headers	show Return-Path: <claudiu.beznea@tuxon.dev> ip: 209.85.128.53, mailfrom: claudiu.beznea@tuxon.dev) From: Claudiu <claudiu.beznea@tuxon.dev> To: nobuhiro1.iwamatsu@toshiba.co.jp, pavel@denx.de Cc: cip-dev@lists.cip-project.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, paul.barker.ct@bp.renesas.com Subject: [PATCH 6.1.y-cip 19/33] net: ravb: Simplify ravb_suspend() Date: Wed, 29 May 2024 11:14:20 +0300 Message-Id: <20240529081434.639519-20-claudiu.beznea.uj@bp.renesas.com> In-Reply-To: <20240529081434.639519-1-claudiu.beznea.uj@bp.renesas.com> References: <20240529081434.639519-1-claudiu.beznea.uj@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Add Ethernet support for Renesas RZ/G3S SoC \| expand [6.1.y-cip,00/33] Add Ethernet support for Renesas RZ/G3S SoC [6.1.y-cip,01/33] clk: renesas: r9a08g045: Add clock and reset support for ETH0 and ETH1 [6.1.y-cip,02/33] pinctrl: renesas: rzg2l: Move arg and index in the main function block [6.1.y-cip,03/33] pinctrl: renesas: rzg2l: Add pin configuration support for pinmux groups [6.1.y-cip,04/33] pinctrl: renesas: rzg2l: Add support to select power source for Ethernet pins [6.1.y-cip,05/33] pinctrl: renesas: rzg2l: Add output enable support [6.1.y-cip,06/33] pinctrl: renesas: rzg2l: Add input enable to the Ethernet pins [6.1.y-cip,07/33] pinctrl: renesas: rzg2l: Fix locking in rzg2l_dt_subnode_to_map() [6.1.y-cip,08/33] dt-bindings: net: renesas,etheravb: Document RZ/G3S support [6.1.y-cip,09/33] net: ravb: Rely on PM domain to enable gptp_clk [6.1.y-cip,10/33] net: ravb: Make reset controller support mandatory [6.1.y-cip,11/33] net: ravb: Assert/de-assert reset on suspend/resume [6.1.y-cip,12/33] net: ravb: Move reference clock enable/disable on runtime PM APIs [6.1.y-cip,13/33] net: ravb: Move getting/requesting IRQs in the probe() method [6.1.y-cip,14/33] net: ravb: Split GTI computation and set operations [6.1.y-cip,15/33] net: ravb: Move delay mode set in the driver's ndo_open API [6.1.y-cip,16/33] net: ravb: Move DBAT configuration to the driver's ndo_open API [6.1.y-cip,17/33] net: ravb: Move PTP initialization in the driver's ndo_open API for ccc_gac plato… [6.1.y-cip,18/33] net: ravb: Set config mode in ndo_open and reset mode in ndo_close [6.1.y-cip,19/33] net: ravb: Simplify ravb_suspend() [6.1.y-cip,20/33] net: ravb: Simplify ravb_resume() [6.1.y-cip,21/33] ravb: Add Rx checksum offload support for GbEth [6.1.y-cip,22/33] ravb: Add Tx checksum offload support for GbEth [6.1.y-cip,23/33] net: ravb: Get rid of the temporary variable irq [6.1.y-cip,24/33] net: ravb: Keep the reverse order of operations in ravb_close() [6.1.y-cip,25/33] net: ravb: Return cached statistics if the interface is down [6.1.y-cip,26/33] net: ravb: Move the update of ndev->features to ravb_set_features() [6.1.y-cip,27/33] net: ravb: Do not apply features to hardware if the interface is down [6.1.y-cip,28/33] net: ravb: Add runtime PM support [6.1.y-cip,29/33] net: ravb: Fix registered interrupt names [6.1.y-cip,30/33] arm64: dts: renesas: r9a08g045: Add Ethernet nodes [6.1.y-cip,31/33] arm64: dts: renesas: rzg3s-smarc-som: Use switches' names to select on-board func… [6.1.y-cip,32/33] arm64: dts: renesas: rzg3s-smarc-som: Enable the Ethernet interfaces [6.1.y-cip,33/33] arm64: dts: renesas: rzg3s-smarc-som: Guard Ethernet IRQ GPIO hogs

Commit Message

claudiu beznea May 29, 2024, 8:14 a.m. UTC

From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>

commit b07bc55cbb1cf88a527d687fccd4a12bac744486 upstream.

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>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
---
 drivers/net/ethernet/renesas/ravb_main.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index a76cc7aec5df..38b6807428c8 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2951,6 +2951,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);
 }
 
@@ -2983,14 +2986,10 @@  static int __maybe_unused 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: