]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: emaclite: Replace alloc_etherdev() with devm_alloc_etherdev()
authorAbin Joseph <abin.joseph@amd.com>
Wed, 9 Oct 2024 16:28:22 +0000 (21:58 +0530)
committerJakub Kicinski <kuba@kernel.org>
Fri, 11 Oct 2024 22:41:34 +0000 (15:41 -0700)
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>
drivers/net/ethernet/xilinx/xilinx_emaclite.c

index 2eb7f23538a6cb0a87ada7c5384aa8aa5273125b..41858794252716b57e8d4278f47c57714f0accd4 100644 (file)
@@ -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