diff mbox series

net: mvneta: Switch to using devm_alloc_etherdev_mqs

Message ID 20190309051529.23323-1-rosenp@gmail.com
State Deferred
Delegated to: David Miller
Headers show
Series net: mvneta: Switch to using devm_alloc_etherdev_mqs | expand

Commit Message

Rosen Penev March 9, 2019, 5:15 a.m. UTC 
It allows some of the code to be simplified.

Tested on Turris Omnia.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/marvell/mvneta.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Comments

David Miller March 9, 2019, 7:24 a.m. UTC | #1 
From: Rosen Penev <rosenp@gmail.com>
Date: Fri,  8 Mar 2019 21:15:29 -0800

> It allows some of the code to be simplified.
> 
> Tested on Turris Omnia.
> 
> Signed-off-by: Rosen Penev <rosenp@gmail.com>

This and your other patch are both net-next material.

net-next is closed, please resubmit these when it reopens.

Thank you.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index ff275780040f..e73c3af4ea9b 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -4457,15 +4457,14 @@  static int mvneta_probe(struct platform_device *pdev)
 	int err;
 	int cpu;
 
-	dev = alloc_etherdev_mqs(sizeof(struct mvneta_port), txq_number, rxq_number);
+	dev = devm_alloc_etherdev_mqs(&pdev->dev, sizeof(struct mvneta_port),
+				      txq_number, rxq_number);
 	if (!dev)
 		return -ENOMEM;
 
 	dev->irq = irq_of_parse_and_map(dn, 0);
-	if (dev->irq == 0) {
-		err = -EINVAL;
-		goto err_free_netdev;
-	}
+	if (dev->irq == 0)
+		return -EINVAL;
 
 	phy_mode = of_get_phy_mode(dn);
 	if (phy_mode < 0) {
@@ -4686,9 +4685,6 @@  static int mvneta_probe(struct platform_device *pdev)
 		phylink_destroy(pp->phylink);
 err_free_irq:
 	irq_dispose_mapping(dev->irq);
-err_free_netdev:
-	free_netdev(dev);
-	return err;
 }
 
 /* Device removal routine */
@@ -4704,7 +4700,6 @@  static int mvneta_remove(struct platform_device *pdev)
 	free_percpu(pp->stats);
 	irq_dispose_mapping(dev->irq);
 	phylink_destroy(pp->phylink);
-	free_netdev(dev);
 
 	if (pp->bm_priv) {
 		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);