From: Sean Anderson <sean.anderson@linux.dev>
To: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michal Simek <michal.simek@amd.com>,
linux-arm-kernel@lists.infradead.org,
Leon Romanovsky <leon@kernel.org>,
Sean Anderson <sean.anderson@linux.dev>
Subject: [PATCH net-next v3 4/7] net: axienet: Simplify axienet_mdio_setup
Date: Mon, 28 Jul 2025 18:18:20 -0400 [thread overview]
Message-ID: <20250728221823.11968-5-sean.anderson@linux.dev> (raw)
In-Reply-To: <20250728221823.11968-1-sean.anderson@linux.dev>
We always put the mdio_node and disable the bus after probing, so
perform these steps unconditionally.
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
---
(no changes since v1)
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index cacd5590731d..2799d168ed9d 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -302,19 +302,14 @@ int axienet_mdio_setup(struct axienet_local *lp)
ret = axienet_mdio_enable(bus, mdio_node);
if (ret < 0)
goto unregister;
+
ret = of_mdiobus_register(bus, mdio_node);
- if (ret)
- goto unregister_mdio_enabled;
of_node_put(mdio_node);
axienet_mdio_mdc_disable(lp);
- return 0;
-
-unregister_mdio_enabled:
- axienet_mdio_mdc_disable(lp);
-unregister:
- of_node_put(mdio_node);
- mdiobus_free(bus);
- lp->mii_bus = NULL;
+ if (ret) {
+ mdiobus_free(bus);
+ lp->mii_bus = NULL;
+ }
return ret;
}
--
2.35.1.1320.gc452695387.dirty
next prev parent reply other threads:[~2025-07-28 22:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-28 22:18 [PATCH net-next v3 0/7] net: axienet: Fix deferred probe loop Sean Anderson
2025-07-28 22:18 ` [PATCH net-next v3 1/7] net: axienet: Fix resource release ordering Sean Anderson
2025-07-30 9:27 ` Gupta, Suraj
2025-07-28 22:18 ` [PATCH net-next v3 2/7] net: axienet: Use ioread32/iowrite32 directly Sean Anderson
2025-07-29 4:28 ` Subbaraya Sundeep
2025-07-28 22:18 ` [PATCH net-next v3 3/7] net: axienet: Use MDIO bus device in prints Sean Anderson
2025-07-29 9:07 ` kernel test robot
2025-07-28 22:18 ` Sean Anderson [this message]
2025-07-28 22:18 ` [PATCH net-next v3 5/7] net: axienet: Use device variable in probe Sean Anderson
2025-07-28 22:18 ` [PATCH net-next v3 6/7] net: axienet: Rearrange lifetime functions Sean Anderson
2025-07-28 22:18 ` [PATCH net-next v3 7/7] net: axienet: Split into MAC and MDIO drivers Sean Anderson
2025-07-29 4:16 ` Subbaraya Sundeep
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250728221823.11968-5-sean.anderson@linux.dev \
--to=sean.anderson@linux.dev \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=radhey.shyam.pandey@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.