From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: andrew@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org,
olek2@wp.pl, shannon.nelson@amd.com
Subject: [PATCH net-next 3/9] net: lantiq_etop: use devm for register_netdev
Date: Mon, 30 Sep 2024 13:24:28 -0700 [thread overview]
Message-ID: <20240930202434.296960-4-rosenp@gmail.com> (raw)
In-Reply-To: <20240930202434.296960-1-rosenp@gmail.com>
This is the last to be created and so must be the first to be freed.
Simpler to avoid by using devm.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/ethernet/lantiq_etop.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index de4f75ce8d9d..988f204fd89c 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -587,7 +587,7 @@ ltq_etop_init(struct net_device *dev)
err = ltq_etop_set_mac_address(dev, &mac);
if (err)
- goto err_netdev;
+ goto err_hw;
/* Set addr_assign_type here, ltq_etop_set_mac_address would reset it. */
if (random_mac)
@@ -596,11 +596,9 @@ ltq_etop_init(struct net_device *dev)
ltq_etop_set_multicast_list(dev);
err = ltq_etop_mdio_init(dev);
if (err)
- goto err_netdev;
+ goto err_hw;
return 0;
-err_netdev:
- unregister_netdev(dev);
err_hw:
ltq_etop_hw_exit(dev);
return err;
@@ -709,7 +707,7 @@ ltq_etop_probe(struct platform_device *pdev)
priv->ch[i].netdev = dev;
}
- err = register_netdev(dev);
+ err = devm_register_netdev(&pdev->dev, dev);
if (err)
goto err_out;
@@ -728,7 +726,6 @@ static void ltq_etop_remove(struct platform_device *pdev)
netif_tx_stop_all_queues(dev);
ltq_etop_hw_exit(dev);
ltq_etop_mdio_cleanup(dev);
- unregister_netdev(dev);
}
}
--
2.46.2
next prev parent reply other threads:[~2024-09-30 20:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-30 20:24 [PATCH net-next 0/9] net: lantiq_etop: some cleanups Rosen Penev
2024-09-30 20:24 ` [PATCH net-next 1/9] net: lantiq_etop: use netif_receive_skb_list Rosen Penev
2024-09-30 20:24 ` [PATCH net-next 2/9] net: lantiq_etop: use devm_alloc_etherdev_mqs Rosen Penev
2024-09-30 20:24 ` Rosen Penev [this message]
2024-09-30 20:24 ` [PATCH net-next 4/9] net: lantiq_etop: use devm for mdiobus Rosen Penev
2024-09-30 20:24 ` [PATCH net-next 5/9] net: lantiq_etop: move phy_disconnect to stop Rosen Penev
2024-09-30 20:24 ` [PATCH net-next 6/9] net: lantiq_etop: use devm_err_probe Rosen Penev
2024-09-30 20:24 ` [PATCH net-next 7/9] net: lantiq_etop: remove struct resource Rosen Penev
2024-10-01 15:33 ` Simon Horman
2024-09-30 20:24 ` [PATCH net-next 8/9] net: lantiq_etop: use module_platform_driver_probe Rosen Penev
2024-09-30 20:24 ` [PATCH net-next 9/9] net: lantiq_etop: no queue stop in remove Rosen Penev
2024-09-30 22:02 ` [PATCH net-next 0/9] net: lantiq_etop: some cleanups Nelson, Shannon
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=20240930202434.296960-4-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olek2@wp.pl \
--cc=pabeni@redhat.com \
--cc=shannon.nelson@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 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).