diff mbox series

net: xilinx: axienet: Reduce scopes for two resources in axienet_probe()

Message ID 2e6f6f8f-89de-4b75-a0af-3a55bc046ab7@web.de (mailing list archive)
State Deferred
Delegated to: Netdev Maintainers
Headers show
Series net: xilinx: axienet: Reduce scopes for two resources in axienet_probe() | expand

Checks

Context Check Description
netdev/series_format warning Single patches do not need cover letters; Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 16 this patch: 16
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 16 this patch: 16
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 18 this patch: 18
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 28 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 3 this patch: 3
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-09-20--15-00 (tests: 764)

Commit Message

Markus Elfring Sept. 20, 2024, 9:22 a.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 20 Sep 2024 11:08:10 +0200

The calls “dma_release_channel(tx_chan)” and “of_node_put(np)”
were immediately used after return value checks in this
function implementation.
Thus use such function calls only once instead directly before the checks.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--
2.46.0

Comments

Simon Horman Sept. 22, 2024, 4:59 p.m. UTC | #1 
On Fri, Sep 20, 2024 at 11:22:47AM +0200, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Fri, 20 Sep 2024 11:08:10 +0200
> 
> The calls “dma_release_channel(tx_chan)” and “of_node_put(np)”
> were immediately used after return value checks in this
> function implementation.
> Thus use such function calls only once instead directly before the checks.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Hi Markus,

This change seems reasonable to me.  However, I am assuming that as a
non-bug-fix, this is targeted at net-next.  And net-next is currently
closed for the v6.12 merge window.  Please consider reposting this patch
once net-next reopens.  That will occur after v6.12-rc1 has been released.
Which I expect to be about a week from now.

Also, for networking patches please tag non-bug fixes for
net-next (and bug fixes for net, being sure to include a Fixes tag).

	Subject: [PATCH net-next] ...

Please see https://docs.kernel.org/process/maintainer-netdev.html
diff mbox series

Patch

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index ea7d7c03f48e..e3d9801ad17e 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -2806,13 +2806,12 @@  static int axienet_probe(struct platform_device *pdev)
 		cfg.reset = 1;
 		/* As name says VDMA but it has support for DMA channel reset */
 		ret = xilinx_vdma_channel_set_config(tx_chan, &cfg);
+		dma_release_channel(tx_chan);
 		if (ret < 0) {
 			dev_err(&pdev->dev, "Reset channel failed\n");
-			dma_release_channel(tx_chan);
 			goto cleanup_clk;
 		}

-		dma_release_channel(tx_chan);
 		lp->use_dmaengine = 1;
 	}

@@ -2860,12 +2859,12 @@  static int axienet_probe(struct platform_device *pdev)
 			goto cleanup_mdio;
 		}
 		lp->pcs_phy = of_mdio_find_device(np);
+		of_node_put(np);
 		if (!lp->pcs_phy) {
 			ret = -EPROBE_DEFER;
-			of_node_put(np);
 			goto cleanup_mdio;
 		}
-		of_node_put(np);
+
 		lp->pcs.ops = &axienet_pcs_ops;
 		lp->pcs.neg_mode = true;
 		lp->pcs.poll = true;