From: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
To: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <nicolas.ferre@microchip.com>, <claudiu.beznea@microchip.com>,
<davem@davemloft.net>, <kuba@kernel.org>, <andrew@lunn.ch>,
<f.fainelli@gmail.com>, <robh+dt@kernel.org>,
<alexandre.belloni@bootlin.com>,
<ludovic.desroches@microchip.com>,
"Codrin Ciubotariu" <codrin.ciubotariu@microchip.com>
Subject: [PATCH net-next v3 1/7] net: macb: use device-managed devm_mdiobus_alloc()
Date: Fri, 24 Jul 2020 13:50:27 +0300 [thread overview]
Message-ID: <20200724105033.2124881-2-codrin.ciubotariu@microchip.com> (raw)
In-Reply-To: <20200724105033.2124881-1-codrin.ciubotariu@microchip.com>
Use the device-managed variant for the allocating the MDIO bus. This
cleans-up the code a little on the remove and error paths.
Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Tested-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes in v3:
- added tags from Claudiu and Florian
Changes in v2:
- none
drivers/net/ethernet/cadence/macb_main.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index a6a35e1b0115..89fe7af5e408 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -769,7 +769,7 @@ static int macb_mii_init(struct macb *bp)
/* Enable management port */
macb_writel(bp, NCR, MACB_BIT(MPE));
- bp->mii_bus = mdiobus_alloc();
+ bp->mii_bus = devm_mdiobus_alloc(&bp->pdev->dev);
if (!bp->mii_bus) {
err = -ENOMEM;
goto err_out;
@@ -787,7 +787,7 @@ static int macb_mii_init(struct macb *bp)
err = macb_mdiobus_register(bp);
if (err)
- goto err_out_free_mdiobus;
+ goto err_out;
err = macb_mii_probe(bp->dev);
if (err)
@@ -797,8 +797,6 @@ static int macb_mii_init(struct macb *bp)
err_out_unregister_bus:
mdiobus_unregister(bp->mii_bus);
-err_out_free_mdiobus:
- mdiobus_free(bp->mii_bus);
err_out:
return err;
}
@@ -4571,7 +4569,6 @@ static int macb_probe(struct platform_device *pdev)
err_out_unregister_mdio:
mdiobus_unregister(bp->mii_bus);
- mdiobus_free(bp->mii_bus);
err_out_free_netdev:
free_netdev(dev);
@@ -4599,7 +4596,6 @@ static int macb_remove(struct platform_device *pdev)
if (dev) {
bp = netdev_priv(dev);
mdiobus_unregister(bp->mii_bus);
- mdiobus_free(bp->mii_bus);
unregister_netdev(dev);
tasklet_kill(&bp->hresp_err_tasklet);
--
2.25.1
next prev parent reply other threads:[~2020-07-24 10:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 10:50 [PATCH net-next v3 0/7] Add an MDIO sub-node under MACB Codrin Ciubotariu
2020-07-24 10:50 ` Codrin Ciubotariu [this message]
2020-07-24 10:50 ` [PATCH net-next v3 2/7] dt-bindings: net: macb: use an MDIO node as a container for PHY nodes Codrin Ciubotariu
2020-07-24 10:50 ` [PATCH net-next v3 3/7] net: macb: parse PHY nodes found under an MDIO node Codrin Ciubotariu
2020-07-24 17:40 ` Florian Fainelli
2020-07-27 9:13 ` Codrin.Ciubotariu
2020-07-24 10:50 ` [PATCH net-next v3 4/7] ARM: dts: at91: sama5d2: add an mdio sub-node to macb Codrin Ciubotariu
2020-07-24 10:50 ` [PATCH net-next v3 5/7] ARM: dts: at91: sama5d3: " Codrin Ciubotariu
2020-07-24 10:50 ` [PATCH net-next v3 6/7] ARM: dts: at91: sama5d4: " Codrin Ciubotariu
2020-07-24 10:50 ` [PATCH net-next v3 7/7] ARM: dts: at91: sam9x60: " Codrin Ciubotariu
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=20200724105033.2124881-2-codrin.ciubotariu@microchip.com \
--to=codrin.ciubotariu@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.beznea@microchip.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=robh+dt@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).