dmaengine: sh: rz-dmac: Make channel irq local

The channel IRQ is only used inside the function rz_dmac_chan_probe(),
so there is no need to store it in the rz_dmac_chan structure for later
use.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://patch.msgid.link/312c2e3349f4747e0bca861632bfc3592224b012.1767718556.git.geert+renesas@glider.be
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/sh/rz-dmac.c b/drivers/dma/sh/rz-dmac.c
index 1f687b08d6b8677d9300b5c7274559bfc9574643..3e8d85c6639d4b6928b8365daa8f5070a640d66c 100644 (file)
--- a/drivers/dma/sh/rz-dmac.c
+++ b/drivers/dma/sh/rz-dmac.c
@@ -65,7 +65,6 @@ struct rz_dmac_chan {
        void __iomem *ch_base;
        void __iomem *ch_cmn_base;
        unsigned int index;
-       int irq;
        struct rz_dmac_desc *desc;
        int descs_allocated;
 
@@ -795,29 +794,27 @@ static int rz_dmac_chan_probe(struct rz_dmac *dmac,
        struct rz_lmdesc *lmdesc;
        char pdev_irqname[6];
        char *irqname;
-       int ret;
+       int irq, ret;
 
        channel->index = index;
        channel->mid_rid = -EINVAL;
 
        /* Request the channel interrupt. */
        scnprintf(pdev_irqname, sizeof(pdev_irqname), "ch%u", index);
-       channel->irq = platform_get_irq_byname(pdev, pdev_irqname);
-       if (channel->irq < 0)
-               return channel->irq;
+       irq = platform_get_irq_byname(pdev, pdev_irqname);
+       if (irq < 0)
+               return irq;
 
        irqname = devm_kasprintf(dmac->dev, GFP_KERNEL, "%s:%u",
                                 dev_name(dmac->dev), index);
        if (!irqname)
                return -ENOMEM;
 
-       ret = devm_request_threaded_irq(dmac->dev, channel->irq,
-                                       rz_dmac_irq_handler,
+       ret = devm_request_threaded_irq(dmac->dev, irq, rz_dmac_irq_handler,
                                        rz_dmac_irq_handler_thread, 0,
                                        irqname, channel);
        if (ret) {
-               dev_err(dmac->dev, "failed to request IRQ %u (%d)\n",
-                       channel->irq, ret);
+               dev_err(dmac->dev, "failed to request IRQ %u (%d)\n", irq, ret);
                return ret;
        }