[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250728221823.11968-5-sean.anderson@linux.dev>
Date: Mon, 28 Jul 2025 18:18:20 -0400
From: Sean Anderson <sean.anderson@...ux.dev>
To: Radhey Shyam Pandey <radhey.shyam.pandey@....com>,
Andrew Lunn <andrew+netdev@...n.ch>,
"David S . Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
netdev@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Michal Simek <michal.simek@....com>,
linux-arm-kernel@...ts.infradead.org,
Leon Romanovsky <leon@...nel.org>,
Sean Anderson <sean.anderson@...ux.dev>
Subject: [PATCH net-next v3 4/7] net: axienet: Simplify axienet_mdio_setup
We always put the mdio_node and disable the bus after probing, so
perform these steps unconditionally.
Signed-off-by: Sean Anderson <sean.anderson@...ux.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
Powered by blists - more mailing lists