netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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: [PATCHv2 net-next 02/10] net: lantiq_etop: use devm_alloc_etherdev_mqs
Date: Tue,  1 Oct 2024 11:45:59 -0700	[thread overview]
Message-ID: <20241001184607.193461-3-rosenp@gmail.com> (raw)
In-Reply-To: <20241001184607.193461-1-rosenp@gmail.com>

It seems there's a missing free_netdev in the remove function. Just
avoid manual frees and use devm.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>
---
 drivers/net/ethernet/lantiq_etop.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 94b37c12f3f7..de4f75ce8d9d 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -601,7 +601,6 @@ ltq_etop_init(struct net_device *dev)
 
 err_netdev:
 	unregister_netdev(dev);
-	free_netdev(dev);
 err_hw:
 	ltq_etop_hw_exit(dev);
 	return err;
@@ -672,7 +671,8 @@ ltq_etop_probe(struct platform_device *pdev)
 		goto err_out;
 	}
 
-	dev = alloc_etherdev_mq(sizeof(struct ltq_etop_priv), 4);
+	dev = devm_alloc_etherdev_mqs(&pdev->dev, sizeof(struct ltq_etop_priv),
+				      4, 4);
 	if (!dev) {
 		err = -ENOMEM;
 		goto err_out;
@@ -690,13 +690,13 @@ ltq_etop_probe(struct platform_device *pdev)
 	err = device_property_read_u32(&pdev->dev, "lantiq,tx-burst-length", &priv->tx_burst_len);
 	if (err < 0) {
 		dev_err(&pdev->dev, "unable to read tx-burst-length property\n");
-		goto err_free;
+		goto err_out;
 	}
 
 	err = device_property_read_u32(&pdev->dev, "lantiq,rx-burst-length", &priv->rx_burst_len);
 	if (err < 0) {
 		dev_err(&pdev->dev, "unable to read rx-burst-length property\n");
-		goto err_free;
+		goto err_out;
 	}
 
 	for (i = 0; i < MAX_DMA_CHAN; i++) {
@@ -711,13 +711,11 @@ ltq_etop_probe(struct platform_device *pdev)
 
 	err = register_netdev(dev);
 	if (err)
-		goto err_free;
+		goto err_out;
 
 	platform_set_drvdata(pdev, dev);
 	return 0;
 
-err_free:
-	free_netdev(dev);
 err_out:
 	return err;
 }
-- 
2.46.2


  parent reply	other threads:[~2024-10-01 18:46 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-01 18:45 [PATCHv2 net-next 00/10] net: lantiq_etop: some cleanups Rosen Penev
2024-10-01 18:45 ` [PATCHv2 net-next 01/10] net: lantiq_etop: use netif_receive_skb_list Rosen Penev
2024-10-01 22:40   ` Andrew Lunn
2024-10-01 23:39     ` Rosen Penev
2024-10-01 18:45 ` Rosen Penev [this message]
2024-10-01 18:46 ` [PATCHv2 net-next 03/10] net: lantiq_etop: use devm for register_netdev Rosen Penev
2024-10-01 22:48   ` Andrew Lunn
2024-10-01 18:46 ` [PATCHv2 net-next 04/10] net: lantiq_etop: use devm for mdiobus Rosen Penev
2024-10-01 22:51   ` Andrew Lunn
2024-10-01 18:46 ` [PATCHv2 net-next 05/10] net: lantiq_etop: move phy_disconnect to stop Rosen Penev
2024-10-01 22:56   ` Andrew Lunn
2024-10-03 21:09   ` Aleksander Jan Bajkowski
2024-10-01 18:46 ` [PATCHv2 net-next 06/10] net: lantiq_etop: use devm_err_probe Rosen Penev
2024-10-01 18:46 ` [PATCHv2 net-next 07/10] net: lantiq_etop: remove struct resource Rosen Penev
2024-10-01 18:46 ` [PATCHv2 net-next 08/10] net: lantiq_etop: use module_platform_driver_probe Rosen Penev
2024-10-03 17:55   ` kernel test robot
2024-10-03 23:26   ` kernel test robot
2024-10-01 18:46 ` [PATCHv2 net-next 09/10] net: lantiq_etop: no queue stop in remove Rosen Penev
2024-10-01 18:46 ` [PATCHv2 net-next 10/10] net: lantiq_etop: return by register_netdev Rosen Penev

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=20241001184607.193461-3-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).