diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 04:59:20 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 05:19:20 -0400 |
commit | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (patch) | |
tree | 25e861892f6287df6cdccf00067b61cd0b322d95 /sound/isa/gus | |
parent | af1910a817c5ad52c32dddacc1744cfa1b35889e (diff) |
sound: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/gus')
-rw-r--r-- | sound/isa/gus/gus_main.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/gusmax.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/interwave.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index 12eb98f2f931..3167e5ac3699 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c | |||
@@ -180,7 +180,7 @@ int snd_gus_create(struct snd_card *card, | |||
180 | snd_gus_free(gus); | 180 | snd_gus_free(gus); |
181 | return -EBUSY; | 181 | return -EBUSY; |
182 | } | 182 | } |
183 | if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) { | 183 | if (irq >= 0 && request_irq(irq, snd_gus_interrupt, 0, "GUS GF1", (void *) gus)) { |
184 | snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq); | 184 | snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq); |
185 | snd_gus_free(gus); | 185 | snd_gus_free(gus); |
186 | return -EBUSY; | 186 | return -EBUSY; |
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index 3e4a58b72913..c43faa057ff6 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c | |||
@@ -291,7 +291,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev) | |||
291 | goto _err; | 291 | goto _err; |
292 | } | 292 | } |
293 | 293 | ||
294 | if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) { | 294 | if (request_irq(xirq, snd_gusmax_interrupt, 0, "GUS MAX", (void *)maxcard)) { |
295 | snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); | 295 | snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); |
296 | err = -EBUSY; | 296 | err = -EBUSY; |
297 | goto _err; | 297 | goto _err; |
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index c7b80e4730fc..5f869a32b48c 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
@@ -684,7 +684,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev) | |||
684 | if ((err = snd_gus_initialize(gus)) < 0) | 684 | if ((err = snd_gus_initialize(gus)) < 0) |
685 | return err; | 685 | return err; |
686 | 686 | ||
687 | if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED, | 687 | if (request_irq(xirq, snd_interwave_interrupt, 0, |
688 | "InterWave", iwcard)) { | 688 | "InterWave", iwcard)) { |
689 | snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); | 689 | snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); |
690 | return -EBUSY; | 690 | return -EBUSY; |