net: ibm: emac: mal: use devm for request_irq

Avoids manual frees. Also replaced irq_of_parse_and_map with
platform_get_irq since it's simpler and does the same thing.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20241030203727.6039-12-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index f1f5e805ebbac3d58dd88524ae6f3385b757f2db..db9faac213172f9e9354ebc9b1a179a611ea9840 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -579,19 +579,19 @@ static int mal_probe(struct platform_device *ofdev)
 #endif
        }
 
-       mal->txeob_irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
-       mal->rxeob_irq = irq_of_parse_and_map(ofdev->dev.of_node, 1);
-       mal->serr_irq = irq_of_parse_and_map(ofdev->dev.of_node, 2);
+       mal->txeob_irq = platform_get_irq(ofdev, 0);
+       mal->rxeob_irq = platform_get_irq(ofdev, 1);
+       mal->serr_irq = platform_get_irq(ofdev, 2);
 
        if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {
                mal->txde_irq = mal->rxde_irq = mal->serr_irq;
        } else {
-               mal->txde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 3);
-               mal->rxde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 4);
+               mal->txde_irq = platform_get_irq(ofdev, 3);
+               mal->rxde_irq = platform_get_irq(ofdev, 4);
        }
 
-       if (!mal->txeob_irq || !mal->rxeob_irq || !mal->serr_irq ||
-           !mal->txde_irq  || !mal->rxde_irq) {
+       if (mal->txeob_irq < 0 || mal->rxeob_irq < 0 || mal->serr_irq < 0 ||
+           mal->txde_irq < 0 || mal->rxde_irq < 0) {
                printk(KERN_ERR
                       "mal%d: failed to map interrupts !\n", index);
                err = -ENODEV;
@@ -661,21 +661,26 @@ static int mal_probe(struct platform_device *ofdev)
                hdlr_rxde = mal_rxde;
        }
 
-       err = request_irq(mal->serr_irq, hdlr_serr, irqflags, "MAL SERR", mal);
+       err = devm_request_irq(&ofdev->dev, mal->serr_irq, hdlr_serr, irqflags,
+                              "MAL SERR", mal);
        if (err)
                goto fail2;
-       err = request_irq(mal->txde_irq, hdlr_txde, irqflags, "MAL TX DE", mal);
+       err = devm_request_irq(&ofdev->dev, mal->txde_irq, hdlr_txde, irqflags,
+                              "MAL TX DE", mal);
        if (err)
-               goto fail3;
-       err = request_irq(mal->txeob_irq, mal_txeob, 0, "MAL TX EOB", mal);
+               goto fail2;
+       err = devm_request_irq(&ofdev->dev, mal->txeob_irq, mal_txeob, 0,
+                              "MAL TX EOB", mal);
        if (err)
-               goto fail4;
-       err = request_irq(mal->rxde_irq, hdlr_rxde, irqflags, "MAL RX DE", mal);
+               goto fail2;
+       err = devm_request_irq(&ofdev->dev, mal->rxde_irq, hdlr_rxde, irqflags,
+                              "MAL RX DE", mal);
        if (err)
-               goto fail5;
-       err = request_irq(mal->rxeob_irq, mal_rxeob, 0, "MAL RX EOB", mal);
+               goto fail2;
+       err = devm_request_irq(&ofdev->dev, mal->rxeob_irq, mal_rxeob, 0,
+                              "MAL RX EOB", mal);
        if (err)
-               goto fail6;
+               goto fail2;
 
        /* Enable all MAL SERR interrupt sources */
        set_mal_dcrn(mal, MAL_IER, MAL_IER_EVENTS);
@@ -694,14 +699,6 @@ static int mal_probe(struct platform_device *ofdev)
 
        return 0;
 
- fail6:
-       free_irq(mal->rxde_irq, mal);
- fail5:
-       free_irq(mal->txeob_irq, mal);
- fail4:
-       free_irq(mal->txde_irq, mal);
- fail3:
-       free_irq(mal->serr_irq, mal);
  fail2:
        dma_free_coherent(&ofdev->dev, bd_size, mal->bd_virt, mal->bd_dma);
  fail_dummy:
@@ -726,12 +723,6 @@ static void mal_remove(struct platform_device *ofdev)
                       "mal%d: commac list is not empty on remove!\n",
                       mal->index);
 
-       free_irq(mal->serr_irq, mal);
-       free_irq(mal->txde_irq, mal);
-       free_irq(mal->txeob_irq, mal);
-       free_irq(mal->rxde_irq, mal);
-       free_irq(mal->rxeob_irq, mal);
-
        mal_reset(mal);
 
        free_netdev(mal->dummy_dev);