summaryrefslogtreecommitdiff
path: root/sound/mips
diff options
context:
space:
mode:
authorMeng Tang <tangmeng@uniontech.com>2022-02-25 19:19:29 +0800
committerTakashi Iwai <tiwai@suse.de>2022-02-28 16:59:01 +0100
commita544684b790f3e9f75173b3b42d7dad1c89dd237 (patch)
tree05ddd40d533a2d8d73d974200cd934c9274ad2e4 /sound/mips
parentd23c49562a887a8875b144d092034e14b0e279ff (diff)
downloadlinux-next-a544684b790f3e9f75173b3b42d7dad1c89dd237.tar.gz
ALSA: mips: Use platform_get_irq() to get the interrupt
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>
Diffstat (limited to 'sound/mips')
-rw-r--r--sound/mips/snd-n64.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/mips/snd-n64.c b/sound/mips/snd-n64.c
index 463a6fe589eb..bff6d85b8fe2 100644
--- a/sound/mips/snd-n64.c
+++ b/sound/mips/snd-n64.c
@@ -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;