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/soc | |
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/soc')
-rw-r--r-- | sound/soc/au1x/dma.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320dac33.c | 2 | ||||
-rw-r--r-- | sound/soc/nuc900/nuc900-pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/sh/fsi.c | 2 | ||||
-rw-r--r-- | sound/soc/txx9/txx9aclc-ac97.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c index 7aa5b7606777..177f7137a9c8 100644 --- a/sound/soc/au1x/dma.c +++ b/sound/soc/au1x/dma.c | |||
@@ -211,7 +211,7 @@ static int alchemy_pcm_open(struct snd_pcm_substream *substream) | |||
211 | /* DMA setup */ | 211 | /* DMA setup */ |
212 | name = (s == SNDRV_PCM_STREAM_PLAYBACK) ? "audio-tx" : "audio-rx"; | 212 | name = (s == SNDRV_PCM_STREAM_PLAYBACK) ? "audio-tx" : "audio-rx"; |
213 | ctx->stream[s].dma = request_au1000_dma(dmaids[s], name, | 213 | ctx->stream[s].dma = request_au1000_dma(dmaids[s], name, |
214 | au1000_dma_interrupt, IRQF_DISABLED, | 214 | au1000_dma_interrupt, 0, |
215 | &ctx->stream[s]); | 215 | &ctx->stream[s]); |
216 | set_dma_mode(ctx->stream[s].dma, | 216 | set_dma_mode(ctx->stream[s].dma, |
217 | get_dma_mode(ctx->stream[s].dma) & ~DMA_NC); | 217 | get_dma_mode(ctx->stream[s].dma) & ~DMA_NC); |
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index faa5e9fb1471..243d17711211 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c | |||
@@ -1431,7 +1431,7 @@ static int dac33_soc_probe(struct snd_soc_codec *codec) | |||
1431 | /* Check if the IRQ number is valid and request it */ | 1431 | /* Check if the IRQ number is valid and request it */ |
1432 | if (dac33->irq >= 0) { | 1432 | if (dac33->irq >= 0) { |
1433 | ret = request_irq(dac33->irq, dac33_interrupt_handler, | 1433 | ret = request_irq(dac33->irq, dac33_interrupt_handler, |
1434 | IRQF_TRIGGER_RISING | IRQF_DISABLED, | 1434 | IRQF_TRIGGER_RISING, |
1435 | codec->name, codec); | 1435 | codec->name, codec); |
1436 | if (ret < 0) { | 1436 | if (ret < 0) { |
1437 | dev_err(codec->dev, "Could not request IRQ%d (%d)\n", | 1437 | dev_err(codec->dev, "Could not request IRQ%d (%d)\n", |
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c index e46d5516e000..865b288bd748 100644 --- a/sound/soc/nuc900/nuc900-pcm.c +++ b/sound/soc/nuc900/nuc900-pcm.c | |||
@@ -268,7 +268,7 @@ static int nuc900_dma_open(struct snd_pcm_substream *substream) | |||
268 | nuc900_audio = nuc900_ac97_data; | 268 | nuc900_audio = nuc900_ac97_data; |
269 | 269 | ||
270 | if (request_irq(nuc900_audio->irq_num, nuc900_dma_interrupt, | 270 | if (request_irq(nuc900_audio->irq_num, nuc900_dma_interrupt, |
271 | IRQF_DISABLED, "nuc900-dma", substream)) | 271 | 0, "nuc900-dma", substream)) |
272 | return -EBUSY; | 272 | return -EBUSY; |
273 | 273 | ||
274 | runtime->private_data = nuc900_audio; | 274 | runtime->private_data = nuc900_audio; |
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index f97110e72e85..884c8a107bf9 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -444,7 +444,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) | |||
444 | } | 444 | } |
445 | 445 | ||
446 | ret = request_irq(irq_res->start, s3c_ac97_irq, | 446 | ret = request_irq(irq_res->start, s3c_ac97_irq, |
447 | IRQF_DISABLED, "AC97", NULL); | 447 | 0, "AC97", NULL); |
448 | if (ret < 0) { | 448 | if (ret < 0) { |
449 | dev_err(&pdev->dev, "ac97: interrupt request failed.\n"); | 449 | dev_err(&pdev->dev, "ac97: interrupt request failed.\n"); |
450 | goto err4; | 450 | goto err4; |
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 8e112ccffb13..1493ebf4d943 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -1285,7 +1285,7 @@ static int fsi_probe(struct platform_device *pdev) | |||
1285 | pm_runtime_enable(&pdev->dev); | 1285 | pm_runtime_enable(&pdev->dev); |
1286 | dev_set_drvdata(&pdev->dev, master); | 1286 | dev_set_drvdata(&pdev->dev, master); |
1287 | 1287 | ||
1288 | ret = request_irq(irq, &fsi_interrupt, IRQF_DISABLED, | 1288 | ret = request_irq(irq, &fsi_interrupt, 0, |
1289 | id_entry->name, master); | 1289 | id_entry->name, master); |
1290 | if (ret) { | 1290 | if (ret) { |
1291 | dev_err(&pdev->dev, "irq request err\n"); | 1291 | dev_err(&pdev->dev, "irq request err\n"); |
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 743d07b82c06..a4e3f5501847 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c | |||
@@ -201,7 +201,7 @@ static int __devinit txx9aclc_ac97_dev_probe(struct platform_device *pdev) | |||
201 | if (!drvdata->base) | 201 | if (!drvdata->base) |
202 | return -EBUSY; | 202 | return -EBUSY; |
203 | err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, | 203 | err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, |
204 | IRQF_DISABLED, dev_name(&pdev->dev), drvdata); | 204 | 0, dev_name(&pdev->dev), drvdata); |
205 | if (err < 0) | 205 | if (err < 0) |
206 | return err; | 206 | return err; |
207 | 207 | ||