ALSA: mips: Use platform_get_irq() to get the interrupt
authorMeng Tang <tangmeng@uniontech.com>
Fri, 25 Feb 2022 11:19:29 +0000 (19:19 +0800)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Feb 2022 15:59:01 +0000 (16:59 +0100)
platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
allocation of IRQ resources in DT core code, this causes an issue
when using hierarchical interrupt domains using "interrupts" property
in the node as this bypassed the hierarchical setup and messed up the
irq chaining.

In preparation for removal of static setup of IRQ resource from DT core
code use platform_get_irq().

Signed-off-by: Meng Tang <tangmeng@uniontech.com>
Link: https://lore.kernel.org/r/20220225111929.17194-1-tangmeng@uniontech.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/mips/snd-n64.c

index 463a6fe589eb267f06e7debd87e7ddae054ef8ae..bff6d85b8fe2679e4bbdd5c3467f5daace7df634 100644 (file)
@@ -289,8 +289,7 @@ static int __init n64audio_probe(struct platform_device *pdev)
        struct snd_card *card;
        struct snd_pcm *pcm;
        struct n64audio *priv;
-       struct resource *res;
-       int err;
+       int err, irq;
 
        err = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1,
                           SNDRV_DEFAULT_STR1,
@@ -337,12 +336,12 @@ static int __init n64audio_probe(struct platform_device *pdev)
        strcpy(card->shortname, "N64 Audio");
        strcpy(card->longname, "N64 Audio");
 
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!res) {
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0) {
                err = -EINVAL;
                goto fail_dma_alloc;
        }
-       if (devm_request_irq(&pdev->dev, res->start, n64audio_isr,
+       if (devm_request_irq(&pdev->dev, irq, n64audio_isr,
                                IRQF_SHARED, "N64 Audio", priv)) {
                err = -EBUSY;
                goto fail_dma_alloc;