net: ibm: emac: manage emac_irq with devm

It's the last to go in remove. Safe to let devm handle it.

Also move request_irq to probe for clarity. It's removed in _remove not
close.

Use dev_err_probe instead of printk. Handles EPROBE_DEFER automatically.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20240912024903.6201-3-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 0e94b38..d1e1b3a 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -1228,18 +1228,10 @@ static void emac_print_link_status(struct emac_instance *dev)
 static int emac_open(struct net_device *ndev)
 {
        struct emac_instance *dev = netdev_priv(ndev);
-       int err, i;
+       int i;
 
        DBG(dev, "open" NL);
 
-       /* Setup error IRQ handler */
-       err = request_irq(dev->emac_irq, emac_irq, 0, "EMAC", dev);
-       if (err) {
-               printk(KERN_ERR "%s: failed to request IRQ %d\n",
-                      ndev->name, dev->emac_irq);
-               return err;
-       }
-
        /* Allocate RX ring */
        for (i = 0; i < NUM_RX_BUFF; ++i)
                if (emac_alloc_rx_skb(dev, i)) {
@@ -1293,8 +1285,6 @@ static int emac_open(struct net_device *ndev)
        return 0;
  oom:
        emac_clean_rx_ring(dev);
-       free_irq(dev->emac_irq, dev);
-
        return -ENOMEM;
 }
 
@@ -1408,8 +1398,6 @@ static int emac_close(struct net_device *ndev)
        emac_clean_tx_ring(dev);
        emac_clean_rx_ring(dev);
 
-       free_irq(dev->emac_irq, dev);
-
        netif_carrier_off(ndev);
 
        return 0;
@@ -3082,6 +3070,16 @@ static int emac_probe(struct platform_device *ofdev)
                err = -ENODEV;
                goto err_gone;
        }
+
+       /* Setup error IRQ handler */
+       err = devm_request_irq(&ofdev->dev, dev->emac_irq, emac_irq, 0, "EMAC",
+                              dev);
+       if (err) {
+               dev_err_probe(&ofdev->dev, err, "failed to request IRQ %d",
+                             dev->emac_irq);
+               goto err_gone;
+       }
+
        ndev->irq = dev->emac_irq;
 
        /* Map EMAC regs */
@@ -3237,8 +3235,6 @@ static int emac_probe(struct platform_device *ofdev)
  err_irq_unmap:
        if (dev->wol_irq)
                irq_dispose_mapping(dev->wol_irq);
-       if (dev->emac_irq)
-               irq_dispose_mapping(dev->emac_irq);
  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
@@ -3284,9 +3280,6 @@ static void emac_remove(struct platform_device *ofdev)
 
        if (dev->wol_irq)
                irq_dispose_mapping(dev->wol_irq);
-       if (dev->emac_irq)
-               irq_dispose_mapping(dev->emac_irq);
-
 }
 
 /* XXX Features in here should be replaced by properties... */