net: ibm: emac: use devm for alloc_etherdev

Allows to simplify the code slightly. This is safe to do as free_netdev
gets called last.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20240912024903.6201-2-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 6ace558371726609cd8d7d2040b2d20e522fcfca..0e94b38990781f8874efbc25ff7bbc4cf8d551d4 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -3053,7 +3053,7 @@ static int emac_probe(struct platform_device *ofdev)
 
        /* Allocate our net_device structure */
        err = -ENOMEM;
-       ndev = alloc_etherdev(sizeof(struct emac_instance));
+       ndev = devm_alloc_etherdev(&ofdev->dev, sizeof(struct emac_instance));
        if (!ndev)
                goto err_gone;
 
@@ -3072,7 +3072,7 @@ static int emac_probe(struct platform_device *ofdev)
        /* Init various config data based on device-tree */
        err = emac_init_config(dev);
        if (err)
-               goto err_free;
+               goto err_gone;
 
        /* Get interrupts. EMAC irq is mandatory, WOL irq is optional */
        dev->emac_irq = irq_of_parse_and_map(np, 0);
@@ -3080,7 +3080,7 @@ static int emac_probe(struct platform_device *ofdev)
        if (!dev->emac_irq) {
                printk(KERN_ERR "%pOF: Can't map main interrupt\n", np);
                err = -ENODEV;
-               goto err_free;
+               goto err_gone;
        }
        ndev->irq = dev->emac_irq;
 
@@ -3239,8 +3239,6 @@ static int emac_probe(struct platform_device *ofdev)
                irq_dispose_mapping(dev->wol_irq);
        if (dev->emac_irq)
                irq_dispose_mapping(dev->emac_irq);
- err_free:
-       free_netdev(ndev);
  err_gone:
        /* if we were on the bootlist, remove us as we won't show up and
         * wake up all waiters to notify them in case they were waiting
@@ -3289,7 +3287,6 @@ static void emac_remove(struct platform_device *ofdev)
        if (dev->emac_irq)
                irq_dispose_mapping(dev->emac_irq);
 
-       free_netdev(dev->ndev);
 }
 
 /* XXX Features in here should be replaced by properties... */