diff options
| author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 16:59:20 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 11:19:20 +0200 |
| commit | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (patch) | |
| tree | 25e861892f6287df6cdccf00067b61cd0b322d95 /sound/arm | |
| parent | af1910a817c5ad52c32dddacc1744cfa1b35889e (diff) | |
| download | op-kernel-dev-88e24c3a4b30a6bd361f2b5ce602667a8161b2e8.zip op-kernel-dev-88e24c3a4b30a6bd361f2b5ce602667a8161b2e8.tar.gz | |
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/arm')
| -rw-r--r-- | sound/arm/aaci.c | 2 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index d0cead3..e518d38 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -443,7 +443,7 @@ static int aaci_pcm_open(struct snd_pcm_substream *substream) mutex_lock(&aaci->irq_lock); if (!aaci->users++) { ret = request_irq(aaci->dev->irq[0], aaci_irq, - IRQF_SHARED | IRQF_DISABLED, DRIVER_NAME, aaci); + IRQF_SHARED, DRIVER_NAME, aaci); if (ret != 0) aaci->users--; } diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 88eec38..8ad6535 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c @@ -359,7 +359,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) if (ret) goto err_clk2; - ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, IRQF_DISABLED, "AC97", NULL); + ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL); if (ret < 0) goto err_irq; |
