diff mbox series

[5.10.y-cip,31/47] net: ravb: Simplify ravb_suspend()

Message ID	20240529081039.639010-32-claudiu.beznea.uj@bp.renesas.com (mailing list archive)
State	New
Headers	show Return-Path: <claudiu.beznea@tuxon.dev> ip: 209.85.167.42, 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 5.10.y-cip 31/47] net: ravb: Simplify ravb_suspend() Date: Wed, 29 May 2024 11:10:23 +0300 Message-Id: <20240529081039.639010-32-claudiu.beznea.uj@bp.renesas.com> In-Reply-To: <20240529081039.639010-1-claudiu.beznea.uj@bp.renesas.com> References: <20240529081039.639010-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 [5.10.y-cip,00/47] Add Ethernet support for Renesas RZ/G3S SoC [5.10.y-cip,01/47] clk: renesas: r9a08g045: Add clock and reset support for ETH0 and ETH1 [5.10.y-cip,02/47] pinctrl: renesas: rzg2l: Move arg and index in the main function block [5.10.y-cip,03/47] pinctrl: renesas: rzg2l: Add pin configuration support for pinmux groups [5.10.y-cip,04/47] pinctrl: renesas: rzg2l: Add support to select power source for Ethernet pins [5.10.y-cip,05/47] pinctrl: renesas: rzg2l: Add output enable support [5.10.y-cip,06/47] pinctrl: renesas: rzg2l: Add input enable to the Ethernet pins [5.10.y-cip,07/47] pinctrl: renesas: rzg2l: Fix locking in rzg2l_dt_subnode_to_map() [5.10.y-cip,08/47] ravb: Fix potential use-after-free in ravb_rx_gbeth() [5.10.y-cip,09/47] net: ravb: Fix lack of register setting after system resumed for Gen3 [5.10.y-cip,10/47] net: ravb: Check return value of reset_control_deassert() [5.10.y-cip,11/47] net: ravb: Make write access to CXR35 first before accessing other EMAC registers [5.10.y-cip,12/47] net: ravb: Stop DMA in case of failures on ravb_open() [5.10.y-cip,13/47] net: ravb: Keep reverse order of operations in ravb_remove() [5.10.y-cip,14/47] net: ravb: Wait for operating mode to be applied [5.10.y-cip,15/47] net: ravb: Count packets instead of descriptors in GbEth RX path [5.10.y-cip,16/47] ethernet: renesas: Use div64_ul instead of do_div [5.10.y-cip,17/47] ravb: ravb_close() always returns 0 [5.10.y-cip,18/47] ravb: Use GFP_KERNEL instead of GFP_ATOMIC when possible [5.10.y-cip,19/47] dt-bindings: net: renesas,etheravb: Document RZ/G3S support [5.10.y-cip,20/47] net: ravb: Let IP-specific receive function to interrogate descriptors [5.10.y-cip,21/47] net: ravb: Rely on PM domain to enable gptp_clk [5.10.y-cip,22/47] net: ravb: Make reset controller support mandatory [5.10.y-cip,23/47] net: ravb: Assert/de-assert reset on suspend/resume [5.10.y-cip,24/47] net: ravb: Move reference clock enable/disable on runtime PM APIs [5.10.y-cip,25/47] net: ravb: Move getting/requesting IRQs in the probe() method [5.10.y-cip,26/47] net: ravb: Split GTI computation and set operations [5.10.y-cip,27/47] net: ravb: Move delay mode set in the driver's ndo_open API [5.10.y-cip,28/47] net: ravb: Move DBAT configuration to the driver's ndo_open API [5.10.y-cip,29/47] net: ravb: Move PTP initialization in the driver's ndo_open API for ccc_gac plat… [5.10.y-cip,30/47] net: ravb: Set config mode in ndo_open and reset mode in ndo_close [5.10.y-cip,31/47] net: ravb: Simplify ravb_suspend() [5.10.y-cip,32/47] net: ravb: Simplify ravb_resume() [5.10.y-cip,33/47] ravb: Add Rx checksum offload support for GbEth [5.10.y-cip,34/47] ravb: Add Tx checksum offload support for GbEth [5.10.y-cip,35/47] net: ravb: Get rid of the temporary variable irq [5.10.y-cip,36/47] net: ravb: Keep the reverse order of operations in ravb_close() [5.10.y-cip,37/47] net: ravb: Return cached statistics if the interface is down [5.10.y-cip,38/47] net: ravb: Move the update of ndev->features to ravb_set_features() [5.10.y-cip,39/47] net: ravb: Do not apply features to hardware if the interface is down [5.10.y-cip,40/47] net: ravb: Add runtime PM support [5.10.y-cip,41/47] net: ravb: Fix GbEth jumbo packet RX checksum handling [5.10.y-cip,42/47] net: ravb: Fix RX byte accounting for jumbo packets [5.10.y-cip,43/47] net: ravb: Fix registered interrupt names [5.10.y-cip,44/47] arm64: dts: renesas: r9a08g045: Add Ethernet nodes [5.10.y-cip,45/47] arm64: dts: renesas: rzg3s-smarc-som: Use switches' names to select on-board fun… [5.10.y-cip,46/47] arm64: dts: renesas: rzg3s-smarc-som: Enable the Ethernet interfaces [5.10.y-cip,47/47] arm64: dts: renesas: rzg3s-smarc-som: Guard Ethernet IRQ GPIO hogs

Commit Message

Claudiu Beznea May 29, 2024, 8:10 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 597c303610ca..2a7ff0037676 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2934,6 +2934,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);
 }
 
@@ -2966,14 +2969,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: