mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 23:22:31 +02:00
net: emaclite: Replace alloc_etherdev() with devm_alloc_etherdev()
Use device managed ethernet device allocation to simplify the error handling logic. No functional change. Signed-off-by: Abin Joseph <abin.joseph@amd.com> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/1728491303-1456171-3-git-send-email-radhey.shyam.pandey@amd.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
60dbdc6e08
commit
130fbea551
|
|
@ -1097,7 +1097,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
|
|||
dev_info(dev, "Device Tree Probing\n");
|
||||
|
||||
/* Create an ethernet device instance */
|
||||
ndev = alloc_etherdev(sizeof(struct net_local));
|
||||
ndev = devm_alloc_etherdev(dev, sizeof(struct net_local));
|
||||
if (!ndev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -1110,15 +1110,13 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
|
|||
/* Get IRQ for the device */
|
||||
rc = platform_get_irq(ofdev, 0);
|
||||
if (rc < 0)
|
||||
goto error;
|
||||
return rc;
|
||||
|
||||
ndev->irq = rc;
|
||||
|
||||
lp->base_addr = devm_platform_get_and_ioremap_resource(ofdev, 0, &res);
|
||||
if (IS_ERR(lp->base_addr)) {
|
||||
rc = PTR_ERR(lp->base_addr);
|
||||
goto error;
|
||||
}
|
||||
if (IS_ERR(lp->base_addr))
|
||||
return PTR_ERR(lp->base_addr);
|
||||
|
||||
ndev->mem_start = res->start;
|
||||
ndev->mem_end = res->end;
|
||||
|
|
@ -1167,8 +1165,6 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
|
|||
|
||||
put_node:
|
||||
of_node_put(lp->phy_node);
|
||||
error:
|
||||
free_netdev(ndev);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1197,8 +1193,6 @@ static void xemaclite_of_remove(struct platform_device *of_dev)
|
|||
|
||||
of_node_put(lp->phy_node);
|
||||
lp->phy_node = NULL;
|
||||
|
||||
free_netdev(ndev);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user