net: ucc_geth: use devm for alloc_etherdev
authorRosen Penev <rosenp@gmail.com>
Mon, 4 Nov 2024 21:01:25 +0000 (13:01 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 7 Nov 2024 01:54:47 +0000 (17:54 -0800)
Avoids manual frees. Removes one goto.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20241104210127.307420-3-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/freescale/ucc_geth.c

index 4f77ef480bbed00f74ceba9663c74a1b649a2d9c..bc48a9421402967f9ae7598cc88a865d60e713be 100644 (file)
@@ -3688,9 +3688,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                        ug_info->uf_info.irq);
 
        /* Create an ethernet device instance */
-       dev = alloc_etherdev(sizeof(*ugeth));
-
-       if (dev == NULL) {
+       dev = devm_alloc_etherdev(&ofdev->dev, sizeof(*ugeth));
+       if (!dev) {
                err = -ENOMEM;
                goto err_deregister_fixed_link;
        }
@@ -3730,7 +3729,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                if (netif_msg_probe(ugeth))
                        pr_err("%s: Cannot register net device, aborting\n",
                               dev->name);
-               goto err_free_netdev;
+               goto err_deregister_fixed_link;
        }
 
        of_get_ethdev_address(np, dev);
@@ -3742,8 +3741,6 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 
        return 0;
 
-err_free_netdev:
-       free_netdev(dev);
 err_deregister_fixed_link:
        if (of_phy_is_fixed_link(np))
                of_phy_deregister_fixed_link(np);
@@ -3764,7 +3761,6 @@ static void ucc_geth_remove(struct platform_device* ofdev)
                of_phy_deregister_fixed_link(np);
        of_node_put(ugeth->ug_info->tbi_node);
        of_node_put(ugeth->ug_info->phy_node);
-       free_netdev(dev);
 }
 
 static const struct of_device_id ucc_geth_match[] = {