[PATCH net 1/3] Revert "net: ag71xx: use devm for register_netdev"

[PATCH net 1/3] Revert "net: ag71xx: use devm for register_netdev"

[Rosen Penev]

This reverts commit cc20a4791641a1cbd1525695fac0d4725dd72509.

register_netdev gets called after phylink_create which has no devm
equivalent. phylink_destroy must be called after unregister_netdev and
not before.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/atheros/ag71xx.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index cbc730c7cff2..f2f12642529e 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1926,7 +1926,7 @@ static int ag71xx_probe(struct platform_device *pdev)
 		return dev_err_probe(&pdev->dev, err,
 				     "failed to setup phylink");
 
-	err = devm_register_netdev(&pdev->dev, ndev);
+	err = register_netdev(ndev);
 	if (err) {
 		netif_err(ag, probe, ndev, "unable to register net device\n");
 		return err;
@@ -1939,6 +1939,17 @@ static int ag71xx_probe(struct platform_device *pdev)
 	return 0;
 }
 
+static void ag71xx_remove(struct platform_device *pdev)
+{
+	struct net_device *ndev = platform_get_drvdata(pdev);
+
+	if (!ndev)
+		return;
+
+	unregister_netdev(ndev);
+	platform_set_drvdata(pdev, NULL);
+}
+
 static const u32 ar71xx_fifo_ar7100[] = {
 	0x0fff0000, 0x00001fff, 0x00780fff,
 };
@@ -2024,6 +2035,7 @@ MODULE_DEVICE_TABLE(of, ag71xx_match);
 
 static struct platform_driver ag71xx_driver = {
 	.probe		= ag71xx_probe,
+	.remove_new	= ag71xx_remove,
 	.driver = {
 		.name	= "ag71xx",
 		.of_match_table = ag71xx_match,
-- 
2.52.0

[PATCH net 2/3] Revert "net: ag71xx: remove platform_set_drvdata"

[Rosen Penev]

This reverts commit 94656823c1ac31b35549fc0d96cd7862254e7c3d.

platform_set_drvdata is needed in order to destroy phylink on platform
device removal.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/atheros/ag71xx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index f2f12642529e..7114f2970ac6 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1921,6 +1921,8 @@ static int ag71xx_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
+	platform_set_drvdata(pdev, ndev);
+
 	err = ag71xx_phylink_setup(ag);
 	if (err)
 		return dev_err_probe(&pdev->dev, err,
@@ -1929,6 +1931,7 @@ static int ag71xx_probe(struct platform_device *pdev)
 	err = register_netdev(ndev);
 	if (err) {
 		netif_err(ag, probe, ndev, "unable to register net device\n");
+		platform_set_drvdata(pdev, NULL);
 		return err;
 	}
 
@@ -2035,7 +2038,7 @@ MODULE_DEVICE_TABLE(of, ag71xx_match);
 
 static struct platform_driver ag71xx_driver = {
 	.probe		= ag71xx_probe,
-	.remove_new	= ag71xx_remove,
+	.remove		= ag71xx_remove,
 	.driver = {
 		.name	= "ag71xx",
 		.of_match_table = ag71xx_match,
-- 
2.52.0

[PATCH net 3/3] net: ag71xx: call phylink_destroy on failure

[Rosen Penev]

phylink_create has no devm equivalent and must therefore be handled
manually in probe and remove.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/atheros/ag71xx.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index 7114f2970ac6..285a99ee35f5 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1921,8 +1921,6 @@ static int ag71xx_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	platform_set_drvdata(pdev, ndev);
-
 	err = ag71xx_phylink_setup(ag);
 	if (err)
 		return dev_err_probe(&pdev->dev, err,
@@ -1931,25 +1929,29 @@ static int ag71xx_probe(struct platform_device *pdev)
 	err = register_netdev(ndev);
 	if (err) {
 		netif_err(ag, probe, ndev, "unable to register net device\n");
-		platform_set_drvdata(pdev, NULL);
-		return err;
+		goto err_phylink;
 	}
 
+	platform_set_drvdata(pdev, ndev);
+
 	netif_info(ag, probe, ndev, "Atheros AG71xx at 0x%08lx, irq %d, mode:%s\n",
 		   (unsigned long)ag->mac_base, ndev->irq,
 		   phy_modes(ag->phy_if_mode));
 
 	return 0;
+
+err_phylink:
+	phylink_destroy(ag->phylink);
+	return err;
 }
 
 static void ag71xx_remove(struct platform_device *pdev)
 {
 	struct net_device *ndev = platform_get_drvdata(pdev);
-
-	if (!ndev)
-		return;
+	struct ag71xx *ag = netdev_priv(ndev);
 
 	unregister_netdev(ndev);
+	phylink_destroy(ag->phylink);
 	platform_set_drvdata(pdev, NULL);
 }
 
-- 
2.52.0

Re: [PATCH net 3/3] net: ag71xx: call phylink_destroy on failure

[Jakub Kicinski]

On Mon,  2 Feb 2026 13:46:34 -0800 Rosen Penev wrote:
> phylink_create has no devm equivalent and must therefore be handled
> manually in probe and remove.
> 
> Signed-off-by: Rosen Penev <rosenp@gmail.com>

Missing a fixes tag. Also missing (in patch 1) the ability to compile.

I defer to the phy folks on the question of using
devm_add_action_or_reset
-- 
pw-bot: cr

Re: [PATCH net 1/3] Revert "net: ag71xx: use devm for register_netdev"

[Bartosz Golaszewski]

On Mon, Feb 2, 2026 at 10:48 PM Rosen Penev <rosenp@gmail.com> wrote:
>
> This reverts commit cc20a4791641a1cbd1525695fac0d4725dd72509.
>
> register_netdev gets called after phylink_create which has no devm
> equivalent. phylink_destroy must be called after unregister_netdev and
> not before.
>
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---

Can we just use devm_add_action_or_reset() with a callback calling
phylink_destroy()? It will surely make error handling in probe easier
and avoid mixing devm and non-managed APIs.

Bart

Re: [PATCH net 1/3] Revert "net: ag71xx: use devm for register_netdev"

[Rosen Penev]

On Tue, Feb 3, 2026 at 2:29 AM Bartosz Golaszewski <brgl@kernel.org> wrote:
>
> On Mon, Feb 2, 2026 at 10:48 PM Rosen Penev <rosenp@gmail.com> wrote:
> >
> > This reverts commit cc20a4791641a1cbd1525695fac0d4725dd72509.
> >
> > register_netdev gets called after phylink_create which has no devm
> > equivalent. phylink_destroy must be called after unregister_netdev and
> > not before.
> >
> > Signed-off-by: Rosen Penev <rosenp@gmail.com>
> > ---
>
> Can we just use devm_add_action_or_reset() with a callback calling
> phylink_destroy()? It will surely make error handling in probe easier
> and avoid mixing devm and non-managed APIs.
netdev seems to not like devm, at least according to
process/maintainer-netdev.rst

Anyway, I'm wary of custom devm_add_action_or_reset calls.
>
> Bart