Skip to content

Commit

Permalink
net: mvneta: Switch to using devm_alloc_etherdev_mqs
Browse files Browse the repository at this point in the history
It allows some of the code to be simplified.

Tested on Turris Omnia.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Rosen Penev authored and David S. Miller committed Apr 24, 2019
1 parent 4109a2c commit a3ddd94
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/net/ethernet/marvell/mvneta.c
Original file line number Diff line number Diff line change
Expand Up @@ -4476,15 +4476,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) {
Expand Down Expand Up @@ -4705,8 +4704,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;
}

Expand All @@ -4723,7 +4720,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);
Expand Down

0 comments on commit a3ddd94

Please sign in to comment.