korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

sound: irq: Remove IRQF_DISABLED

Browse Source 
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>
This commit is contained in:
Yong Zhang 2011-09-22 16:59:20 +08:00 committed by Takashi Iwai
parent af1910a817
commit 88e24c3a4b
28 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/initval.h
View File

@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table)
{ {
while (*irq_table != -1) { while (*irq_table != -1) {
if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,
IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ", IRQF_PROBE_SHARED, "ALSA Test IRQ",
(void *) irq_table)) { (void *) irq_table)) {
free_irq(*irq_table, (void *) irq_table); free_irq(*irq_table, (void *) irq_table);
return *irq_table; return *irq_table;

2
sound/arm/aaci.c
View File

@ -443,7 +443,7 @@ static int aaci_pcm_open(struct snd_pcm_substream *substream)
mutex_lock(&aaci->irq_lock); mutex_lock(&aaci->irq_lock);
if (!aaci->users++) { if (!aaci->users++) {
ret = request_irq(aaci->dev->irq[0], aaci_irq, ret = request_irq(aaci->dev->irq[0], aaci_irq,
IRQF_SHARED | IRQF_DISABLED, DRIVER_NAME, aaci); IRQF_SHARED, DRIVER_NAME, aaci);
if (ret != 0) if (ret != 0)
aaci->users--; aaci->users--;
} }

2
sound/arm/pxa2xx-ac97-lib.c
View File

@ -359,7 +359,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
if (ret) if (ret)
goto err_clk2; 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) if (ret < 0)
goto err_irq; goto err_irq;

4
sound/drivers/ml403-ac97cr.c
View File

@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
"0x%x done\n", (unsigned int)ml403_ac97cr->port); "0x%x done\n", (unsigned int)ml403_ac97cr->port);
/* get irq */ /* get irq */
irq = platform_get_irq(pfdev, 0); irq = platform_get_irq(pfdev, 0);
if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED, if (request_irq(irq, snd_ml403_ac97cr_irq, 0,
dev_name(&pfdev->dev), (void *)ml403_ac97cr)) { dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
"unable to grab IRQ %d\n", "unable to grab IRQ %d\n",
@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
"request (playback) irq %d done\n", "request (playback) irq %d done\n",
ml403_ac97cr->irq); ml403_ac97cr->irq);
irq = platform_get_irq(pfdev, 1); irq = platform_get_irq(pfdev, 1);
if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED, if (request_irq(irq, snd_ml403_ac97cr_irq, 0,
dev_name(&pfdev->dev), (void *)ml403_ac97cr)) { dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
"unable to grab IRQ %d\n", "unable to grab IRQ %d\n",

2
sound/drivers/mpu401/mpu401_uart.c
View File

@ -577,7 +577,7 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
else else
mpu->cport = port + 1; mpu->cport = port + 1;
if (irq >= 0) { if (irq >= 0) {
if (request_irq(irq, snd_mpu401_uart_interrupt, IRQF_DISABLED, if (request_irq(irq, snd_mpu401_uart_interrupt, 0,
"MPU401 UART", (void *) mpu)) { "MPU401 UART", (void *) mpu)) {
snd_printk(KERN_ERR "mpu401_uart: " snd_printk(KERN_ERR "mpu401_uart: "
"unable to grab IRQ %d\n", irq); "unable to grab IRQ %d\n", irq);

2
sound/drivers/mtpav.c
View File

@ -589,7 +589,7 @@ static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
return -EBUSY; return -EBUSY;
} }
mcard->port = port; mcard->port = port;
if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) { if (request_irq(irq, snd_mtpav_irqh, 0, "MOTU MTPAV", mcard)) {
snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq); snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
return -EBUSY; return -EBUSY;
} }

2
sound/drivers/serial-u16550.c
View File

@ -816,7 +816,7 @@ static int __devinit snd_uart16550_create(struct snd_card *card,
if (irq >= 0 && irq != SNDRV_AUTO_IRQ) { if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
if (request_irq(irq, snd_uart16550_interrupt, if (request_irq(irq, snd_uart16550_interrupt,
IRQF_DISABLED, "Serial MIDI", uart)) { 0, "Serial MIDI", uart)) {
snd_printk(KERN_WARNING snd_printk(KERN_WARNING
"irq %d busy. Using Polling.\n", irq); "irq %d busy. Using Polling.\n", irq);
} else { } else {

2
sound/isa/ad1816a/ad1816a_lib.c
View File

@ -595,7 +595,7 @@ int __devinit snd_ad1816a_create(struct snd_card *card,
snd_ad1816a_free(chip); snd_ad1816a_free(chip);
return -EBUSY; return -EBUSY;
} }
if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) { if (request_irq(irq, snd_ad1816a_interrupt, 0, "AD1816A", (void *) chip)) {
snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq); snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
snd_ad1816a_free(chip); snd_ad1816a_free(chip);
return -EBUSY; return -EBUSY;

2
sound/isa/es1688/es1688_lib.c
View File

@ -661,7 +661,7 @@ int snd_es1688_create(struct snd_card *card,
snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4); snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);
return -EBUSY; return -EBUSY;
} }
if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) { if (request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip)) {
snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq); snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
return -EBUSY; return -EBUSY;
} }

2
sound/isa/es18xx.c
View File

@ -1805,7 +1805,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,
return -EBUSY; return -EBUSY;
} }
if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", if (request_irq(irq, snd_es18xx_interrupt, 0, "ES18xx",
(void *) card)) { (void *) card)) {
snd_es18xx_free(card); snd_es18xx_free(card);
snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq); snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);

2
sound/isa/gus/gus_main.c
View File

@ -180,7 +180,7 @@ int snd_gus_create(struct snd_card *card,
snd_gus_free(gus); snd_gus_free(gus);
return -EBUSY; return -EBUSY;
} }
if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) { if (irq >= 0 && request_irq(irq, snd_gus_interrupt, 0, "GUS GF1", (void *) gus)) {
snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq); snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
snd_gus_free(gus); snd_gus_free(gus);
return -EBUSY; return -EBUSY;

2
sound/isa/gus/gusmax.c
View File

@ -291,7 +291,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
goto _err; goto _err;
} }
if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) { if (request_irq(xirq, snd_gusmax_interrupt, 0, "GUS MAX", (void *)maxcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
err = -EBUSY; err = -EBUSY;
goto _err; goto _err;

2
sound/isa/gus/interwave.c
View File

@ -684,7 +684,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
if ((err = snd_gus_initialize(gus)) < 0) if ((err = snd_gus_initialize(gus)) < 0)
return err; return err;
if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED, if (request_irq(xirq, snd_interwave_interrupt, 0,
"InterWave", iwcard)) { "InterWave", iwcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
return -EBUSY; return -EBUSY;

2
sound/isa/opl3sa2.c
View File

@ -667,7 +667,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
err = snd_opl3sa2_detect(card); err = snd_opl3sa2_detect(card);
if (err < 0) if (err < 0)
return err; return err;
err = request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED, err = request_irq(xirq, snd_opl3sa2_interrupt, 0,
"OPL3-SA2", card); "OPL3-SA2", card);
if (err) { if (err) {
snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq); snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq);

2
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -892,7 +892,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
#endif #endif
#ifdef OPTi93X #ifdef OPTi93X
error = request_irq(irq, snd_opti93x_interrupt, error = request_irq(irq, snd_opti93x_interrupt,
IRQF_DISABLED, DEV_NAME" - WSS", chip); 0, DEV_NAME" - WSS", chip);
if (error < 0) { if (error < 0) {
snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq); snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq);
return error; return error;

2
sound/isa/sb/sb_common.c
View File

@ -240,7 +240,7 @@ int snd_sbdsp_create(struct snd_card *card,
if (request_irq(irq, irq_handler, if (request_irq(irq, irq_handler,
(hardware == SB_HW_ALS4000 || (hardware == SB_HW_ALS4000 ||
hardware == SB_HW_CS5530) ? hardware == SB_HW_CS5530) ?
IRQF_SHARED : IRQF_DISABLED, IRQF_SHARED : 0,
"SoundBlaster", (void *) chip)) { "SoundBlaster", (void *) chip)) {
snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq); snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
snd_sbdsp_free(chip); snd_sbdsp_free(chip);

2
sound/isa/wavefront/wavefront.c
View File

@ -418,7 +418,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
return -EBUSY; return -EBUSY;
} }
if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt, if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
IRQF_DISABLED, "ICS2115", acard)) { 0, "ICS2115", acard)) {
snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]); snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
return -EBUSY; return -EBUSY;
} }

2
sound/isa/wss/wss_lib.c
View File

@ -1833,7 +1833,7 @@ int snd_wss_create(struct snd_card *card,
} }
chip->cport = cport; chip->cport = cport;
if (!(hwshare & WSS_HWSHARE_IRQ)) if (!(hwshare & WSS_HWSHARE_IRQ))
if (request_irq(irq, snd_wss_interrupt, IRQF_DISABLED, if (request_irq(irq, snd_wss_interrupt, 0,
"WSS", (void *) chip)) { "WSS", (void *) chip)) {
snd_printk(KERN_ERR "wss: can't grab IRQ %d\n", irq); snd_printk(KERN_ERR "wss: can't grab IRQ %d\n", irq);
snd_wss_free(chip); snd_wss_free(chip);

4
sound/mips/au1x00.c
View File

@ -465,13 +465,13 @@ snd_au1000_pcm_new(struct snd_au1000 *au1000)
flags = claim_dma_lock(); flags = claim_dma_lock();
if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX, if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX,
"AC97 TX", au1000_dma_interrupt, IRQF_DISABLED, "AC97 TX", au1000_dma_interrupt, 0,
au1000->stream[PLAYBACK])) < 0) { au1000->stream[PLAYBACK])) < 0) {
release_dma_lock(flags); release_dma_lock(flags);
return -EBUSY; return -EBUSY;
} }
if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX, if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX,
"AC97 RX", au1000_dma_interrupt, IRQF_DISABLED, "AC97 RX", au1000_dma_interrupt, 0,
au1000->stream[CAPTURE])) < 0){ au1000->stream[CAPTURE])) < 0){
release_dma_lock(flags); release_dma_lock(flags);
return -EBUSY; return -EBUSY;

4
sound/pci/sis7019.c
View File

@ -1234,7 +1234,7 @@ static int sis_resume(struct pci_dev *pci)
goto error; goto error;
} }
if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED,
KBUILD_MODNAME, sis)) { KBUILD_MODNAME, sis)) {
printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq); printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq);
goto error; goto error;
@ -1340,7 +1340,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
if (rc) if (rc)
goto error_out_cleanup; goto error_out_cleanup;
if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED,
KBUILD_MODNAME, sis)) { KBUILD_MODNAME, sis)) {
printk(KERN_ERR "unable to allocate irq %d\n", sis->irq); printk(KERN_ERR "unable to allocate irq %d\n", sis->irq);
goto error_out_cleanup; goto error_out_cleanup;

2
sound/ppc/snd_ps3.c
View File

@ -845,7 +845,7 @@ static int __devinit snd_ps3_allocate_irq(void)
return ret; return ret;
} }
ret = request_irq(the_card.irq_no, snd_ps3_interrupt, IRQF_DISABLED, ret = request_irq(the_card.irq_no, snd_ps3_interrupt, 0,
SND_PS3_DRIVER_NAME, &the_card); SND_PS3_DRIVER_NAME, &the_card);
if (ret) { if (ret) {
pr_info("%s: request_irq failed (%d)\n", __func__, ret); pr_info("%s: request_irq failed (%d)\n", __func__, ret);

2
sound/soc/au1x/dma.c
View File

@ -211,7 +211,7 @@ static int alchemy_pcm_open(struct snd_pcm_substream *substream)
/* DMA setup */ /* DMA setup */
name = (s == SNDRV_PCM_STREAM_PLAYBACK) ? "audio-tx" : "audio-rx"; name = (s == SNDRV_PCM_STREAM_PLAYBACK) ? "audio-tx" : "audio-rx";
ctx->stream[s].dma = request_au1000_dma(dmaids[s], name, ctx->stream[s].dma = request_au1000_dma(dmaids[s], name,
au1000_dma_interrupt, IRQF_DISABLED, au1000_dma_interrupt, 0,
&ctx->stream[s]); &ctx->stream[s]);
set_dma_mode(ctx->stream[s].dma, set_dma_mode(ctx->stream[s].dma,
get_dma_mode(ctx->stream[s].dma) & ~DMA_NC); get_dma_mode(ctx->stream[s].dma) & ~DMA_NC);

2
sound/soc/codecs/tlv320dac33.c
View File

@ -1431,7 +1431,7 @@ static int dac33_soc_probe(struct snd_soc_codec *codec)
/* Check if the IRQ number is valid and request it */ /* Check if the IRQ number is valid and request it */
if (dac33->irq >= 0) { if (dac33->irq >= 0) {
ret = request_irq(dac33->irq, dac33_interrupt_handler, ret = request_irq(dac33->irq, dac33_interrupt_handler,
IRQF_TRIGGER_RISING | IRQF_DISABLED, IRQF_TRIGGER_RISING,
codec->name, codec); codec->name, codec);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Could not request IRQ%d (%d)\n", dev_err(codec->dev, "Could not request IRQ%d (%d)\n",

2
sound/soc/nuc900/nuc900-pcm.c
View File

@ -268,7 +268,7 @@ static int nuc900_dma_open(struct snd_pcm_substream *substream)
nuc900_audio = nuc900_ac97_data; nuc900_audio = nuc900_ac97_data;
if (request_irq(nuc900_audio->irq_num, nuc900_dma_interrupt, if (request_irq(nuc900_audio->irq_num, nuc900_dma_interrupt,
IRQF_DISABLED, "nuc900-dma", substream)) 0, "nuc900-dma", substream))
return -EBUSY; return -EBUSY;
runtime->private_data = nuc900_audio; runtime->private_data = nuc900_audio;

2
sound/soc/samsung/ac97.c
View File

@ -444,7 +444,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
} }
ret = request_irq(irq_res->start, s3c_ac97_irq, ret = request_irq(irq_res->start, s3c_ac97_irq,
IRQF_DISABLED, "AC97", NULL); 0, "AC97", NULL);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "ac97: interrupt request failed.\n"); dev_err(&pdev->dev, "ac97: interrupt request failed.\n");
goto err4; goto err4;

2
sound/soc/sh/fsi.c
View File

@ -1285,7 +1285,7 @@ static int fsi_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
dev_set_drvdata(&pdev->dev, master); dev_set_drvdata(&pdev->dev, master);
ret = request_irq(irq, &fsi_interrupt, IRQF_DISABLED, ret = request_irq(irq, &fsi_interrupt, 0,
id_entry->name, master); id_entry->name, master);
if (ret) { if (ret) {
dev_err(&pdev->dev, "irq request err\n"); dev_err(&pdev->dev, "irq request err\n");

2
sound/soc/txx9/txx9aclc-ac97.c
View File

@ -201,7 +201,7 @@ static int __devinit txx9aclc_ac97_dev_probe(struct platform_device *pdev)
if (!drvdata->base) if (!drvdata->base)
return -EBUSY; return -EBUSY;
err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq,
IRQF_DISABLED, dev_name(&pdev->dev), drvdata); 0, dev_name(&pdev->dev), drvdata);
if (err < 0) if (err < 0)
return err; return err;

2
sound/sparc/amd7930.c
View File

@ -962,7 +962,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
amd7930_idle(amd); amd7930_idle(amd);
if (request_irq(irq, snd_amd7930_interrupt, if (request_irq(irq, snd_amd7930_interrupt,
IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { IRQF_SHARED, "amd7930", amd)) {
snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n", snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n",
dev, irq); dev, irq);
snd_amd7930_free(amd); snd_amd7930_free(amd);