| Message ID | 1421052021-12560-5-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 80dbb01ad762a2a111b5abad55e44b0408ec342e |
| Headers | show |
At Mon, 12 Jan 2015 09:40:20 +0100, Geert Uytterhoeven wrote: > > IRQ_TYPE_SLOW is no longer used by the Atari platform interrupt code > since commit 734085651c9b80aa ("[PATCH] m68k: convert atari irq code") > in v2.6.18-rc1, so drop it. > > Note that its value has been reused for a different purpose > (IRQ_TYPE_NONE) since commit 6a6de9ef5850d063 ("[PATCH] genirq: core") > in v2.6.18-rc1. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: alsa-devel@alsa-project.org I guess it's easier to take all patches into your tree, so take my ack: Reviewed-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi > --- > sound/oss/dmasound/dmasound_atari.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c > index 13c214466d3b9f0e..1c56bf58eff906e0 100644 > --- a/sound/oss/dmasound/dmasound_atari.c > +++ b/sound/oss/dmasound/dmasound_atari.c > @@ -851,7 +851,7 @@ static int __init AtaIrqInit(void) > st_mfp.tim_dt_a = 1; /* Cause interrupt after first event. */ > st_mfp.tim_ct_a = 8; /* Turn on event counting. */ > /* Register interrupt handler. */ > - if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound", > + if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, 0, "DMA sound", > AtaInterrupt)) > return 0; > st_mfp.int_en_a |= 0x20; /* Turn interrupt on. */ > -- > 1.9.1 >
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 13c214466d3b9f0e..1c56bf58eff906e0 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c @@ -851,7 +851,7 @@ static int __init AtaIrqInit(void) st_mfp.tim_dt_a = 1; /* Cause interrupt after first event. */ st_mfp.tim_ct_a = 8; /* Turn on event counting. */ /* Register interrupt handler. */ - if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound", + if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, 0, "DMA sound", AtaInterrupt)) return 0; st_mfp.int_en_a |= 0x20; /* Turn interrupt on. */
IRQ_TYPE_SLOW is no longer used by the Atari platform interrupt code since commit 734085651c9b80aa ("[PATCH] m68k: convert atari irq code") in v2.6.18-rc1, so drop it. Note that its value has been reused for a different purpose (IRQ_TYPE_NONE) since commit 6a6de9ef5850d063 ("[PATCH] genirq: core") in v2.6.18-rc1. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: alsa-devel@alsa-project.org --- sound/oss/dmasound/dmasound_atari.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)