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

[ALSA] Fix synchronize_irq() bugs, redundancies

Browse Source 
free_irq() calls synchronize_irq() for you, so there is no need for
drivers to manually do the same thing (again).  Thus, calls where
sync-irq immediately precedes free-irq can be simplified.

However, during this audit several bugs were noticed, where free-irq is
preceded by a "irq >= 0" check... but the sync-irq call is not covered
by the same check.

So, where sync-irq could not be eliminated completely, the missing check
was added.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jeff Garzik 2008-04-22 13:50:34 +02:00 committed by Takashi Iwai
parent 8a87c9cf99
commit f000fd8093
22 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/cx88/cx88-alsa.c
View File

@ -690,10 +690,8 @@ MODULE_DEVICE_TABLE(pci, cx88_audio_pci_tbl);
static int snd_cx88_free(snd_cx88_card_t *chip)
{
if (chip->irq >= 0){
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, chip);
}
cx88_core_put(chip->core,chip->pci);

4
drivers/media/video/saa7134/saa7134-alsa.c
View File

@ -954,10 +954,8 @@ static void snd_saa7134_free(struct snd_card * card)
if (chip->dev->dmasound.priv_data == NULL)
return;
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, &chip->dev->dmasound);
}
chip->dev->dmasound.priv_data = NULL;

2
sound/pci/ad1889.c
View File

@ -854,8 +854,6 @@ snd_ad1889_free(struct snd_ad1889 *chip)
spin_unlock_irq(&chip->lock);
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, chip);

4
sound/pci/ali5451/ali5451.c
View File

@ -2047,10 +2047,8 @@ static int snd_ali_free(struct snd_ali * codec)
{
if (codec->hw_initialized)
snd_ali_disable_address_interrupt(codec);
if (codec->irq >= 0) {
synchronize_irq(codec->irq);
if (codec->irq >= 0)
free_irq(codec->irq, codec);
}
if (codec->port)
pci_release_regions(codec->pci);
pci_disable_device(codec->pci);

2
sound/pci/atiixp.c
View File

@ -1553,7 +1553,7 @@ static int snd_atiixp_free(struct atiixp *chip)
if (chip->irq < 0)
goto __hw_end;
snd_atiixp_chip_stop(chip);
synchronize_irq(chip->irq);
__hw_end:
if (chip->irq >= 0)
free_irq(chip->irq, chip);

2
sound/pci/atiixp_modem.c
View File

@ -1197,7 +1197,7 @@ static int snd_atiixp_free(struct atiixp_modem *chip)
if (chip->irq < 0)
goto __hw_end;
snd_atiixp_chip_stop(chip);
synchronize_irq(chip->irq);
__hw_end:
if (chip->irq >= 0)
free_irq(chip->irq, chip);

2
sound/pci/au88x0/au88x0.c
View File

@ -126,7 +126,6 @@ static int snd_vortex_dev_free(struct snd_device *device)
vortex_gameport_unregister(vortex);
vortex_core_shutdown(vortex);
// Take down PCI interface.
synchronize_irq(vortex->irq);
free_irq(vortex->irq, vortex);
iounmap(vortex->mmio);
pci_release_regions(vortex->pci_dev);
@ -220,7 +219,6 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
return 0;
alloc_out:
synchronize_irq(chip->irq);
free_irq(chip->irq, chip);
irq_out:
vortex_core_shutdown(chip);

3
sound/pci/azt3328.c
View File

@ -1514,7 +1514,8 @@ snd_azf3328_free(struct snd_azf3328 *chip)
/* well, at least we know how to disable the timer IRQ */
snd_azf3328_codec_outb(chip, IDX_IO_TIMER_VALUE + 3, 0x00);
synchronize_irq(chip->irq);
if (chip->irq >= 0)
synchronize_irq(chip->irq);
__end_hw:
snd_azf3328_free_joystick(chip);
if (chip->irq >= 0)

2
sound/pci/cmipci.c
View File

@ -2933,8 +2933,6 @@ static int snd_cmipci_free(struct cmipci *cm)
/* reset mixer */
snd_cmipci_mixer_write(cm, 0, 0);
synchronize_irq(cm->irq);
free_irq(cm->irq, cm);
}

3
sound/pci/ens1370.c
View File

@ -1910,7 +1910,8 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq)
outl(0, ES_REG(ensoniq, CONTROL)); /* switch everything off */
outl(0, ES_REG(ensoniq, SERIAL)); /* clear serial interface */
#endif
synchronize_irq(ensoniq->irq);
if (ensoniq->irq >= 0)
synchronize_irq(ensoniq->irq);
pci_set_power_state(ensoniq->pci, 3);
__hw_end:
#ifdef CHIP1370

5
sound/pci/es1938.c
View File

@ -1488,7 +1488,6 @@ static int es1938_suspend(struct pci_dev *pci, pm_message_t state)
outb(0x00, SLIO_REG(chip, IRQCONTROL)); /* disable irqs */
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
free_irq(chip->irq, chip);
chip->irq = -1;
}
@ -1578,10 +1577,8 @@ static int snd_es1938_free(struct es1938 *chip)
snd_es1938_free_gameport(chip);
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, chip);
}
pci_release_regions(chip->pci);
pci_disable_device(chip->pci);
kfree(chip);

3
sound/pci/es1968.c
View File

@ -2475,7 +2475,8 @@ static inline void snd_es1968_free_gameport(struct es1968 *chip) { }
static int snd_es1968_free(struct es1968 *chip)
{
if (chip->io_port) {
synchronize_irq(chip->irq);
if (chip->irq >= 0)
synchronize_irq(chip->irq);
outw(1, chip->io_port + 0x04); /* clear WP interrupts */
outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
}

5
sound/pci/hda/hda_intel.c
View File

@ -1682,7 +1682,6 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
snd_hda_suspend(chip->bus, state);
azx_stop_chip(chip);
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
free_irq(chip->irq, chip);
chip->irq = -1;
}
@ -1738,10 +1737,8 @@ static int azx_free(struct azx *chip)
azx_stop_chip(chip);
}
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, (void*)chip);
}
if (chip->msi)
pci_disable_msi(chip->pci);
if (chip->remap_addr)

5
sound/pci/ice1712/ice1712.c
View File

@ -2490,10 +2490,9 @@ static int snd_ice1712_free(struct snd_ice1712 *ice)
outb(0xff, ICEREG(ice, IRQMASK));
/* --- */
__hw_end:
if (ice->irq >= 0) {
synchronize_irq(ice->irq);
if (ice->irq >= 0)
free_irq(ice->irq, ice);
}
if (ice->port)
pci_release_regions(ice->pci);
snd_ice1712_akm4xxx_free(ice);

4
sound/pci/ice1712/ice1724.c
View File

@ -2153,10 +2153,8 @@ static int snd_vt1724_free(struct snd_ice1712 *ice)
outb(0xff, ICEREG1724(ice, IRQMASK));
/* --- */
__hw_end:
if (ice->irq >= 0) {
synchronize_irq(ice->irq);
if (ice->irq >= 0)
free_irq(ice->irq, ice);
}
pci_release_regions(ice->pci);
snd_ice1712_akm4xxx_free(ice);
pci_disable_device(ice->pci);

3
sound/pci/intel8x0.c
View File

@ -2468,7 +2468,7 @@ static int snd_intel8x0_free(struct intel8x0 *chip)
pci_write_config_dword(chip->pci, 0x4c, val);
}
/* --- */
synchronize_irq(chip->irq);
__hw_end:
if (chip->irq >= 0)
free_irq(chip->irq, chip);
@ -2517,7 +2517,6 @@ static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)
chip->sdm_saved = igetbyte(chip, ICHREG(SDM));
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
free_irq(chip->irq, chip);
chip->irq = -1;
}

3
sound/pci/intel8x0m.c
View File

@ -986,7 +986,8 @@ static int snd_intel8x0_free(struct intel8x0m *chip)
for (i = 0; i < chip->bdbars_count; i++)
iputbyte(chip, ICH_REG_OFF_CR + chip->ichd[i].reg_offset, ICH_RESETREGS);
/* --- */
synchronize_irq(chip->irq);
if (chip->irq >= 0)
synchronize_irq(chip->irq);
__hw_end:
if (chip->bdbars.area)
snd_dma_free_pages(&chip->bdbars);

4
sound/pci/maestro3.c
View File

@ -2542,10 +2542,8 @@ static int snd_m3_free(struct snd_m3 *chip)
vfree(chip->suspend_mem);
#endif
if (chip->irq >= 0) {
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, chip);
}
if (chip->iobase)
pci_release_regions(chip->pci);

4
sound/pci/oxygen/oxygen_lib.c
View File

@ -410,10 +410,8 @@ static void oxygen_card_free(struct snd_card *card)
oxygen_write16(chip, OXYGEN_DMA_STATUS, 0);
oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0);
spin_unlock_irq(&chip->reg_lock);
if (chip->irq >= 0) {
if (chip->irq >= 0)
free_irq(chip->irq, chip);
synchronize_irq(chip->irq);
}
flush_scheduled_work();
chip->model->cleanup(chip);
mutex_destroy(&chip->mutex);

1
sound/pci/sis7019.c
View File

@ -1194,7 +1194,6 @@ static int sis_suspend(struct pci_dev *pci, pm_message_t state)
/* snd_pcm_suspend_all() stopped all channels, so we're quiescent.
*/
if (sis->irq >= 0) {
synchronize_irq(sis->irq);
free_irq(sis->irq, sis);
sis->irq = -1;
}

2
sound/pci/via82xx.c
View File

@ -2236,7 +2236,7 @@ static int snd_via82xx_free(struct via82xx *chip)
/* disable interrupts */
for (i = 0; i < chip->num_devs; i++)
snd_via82xx_channel_reset(chip, &chip->devs[i]);
synchronize_irq(chip->irq);
if (chip->irq >= 0)
free_irq(chip->irq, chip);
__end_hw:

2
sound/pci/via82xx_modem.c
View File

@ -1075,7 +1075,7 @@ static int snd_via82xx_free(struct via82xx_modem *chip)
/* disable interrupts */
for (i = 0; i < chip->num_devs; i++)
snd_via82xx_channel_reset(chip, &chip->devs[i]);
synchronize_irq(chip->irq);
__end_hw:
if (chip->irq >= 0)
free_irq(chip->irq, chip);