Merge branch 'test/pci-rename' into topic/misc
This commit is contained in:
commit
85e4d95da0
|
@ -1164,7 +1164,7 @@
|
|||
}
|
||||
chip->port = pci_resource_start(pci, 0);
|
||||
if (request_irq(pci->irq, snd_mychip_interrupt,
|
||||
IRQF_SHARED, "My Chip", chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
|
||||
snd_mychip_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1197,7 +1197,7 @@
|
|||
|
||||
/* pci_driver definition */
|
||||
static struct pci_driver driver = {
|
||||
.name = "My Own Chip",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_mychip_ids,
|
||||
.probe = snd_mychip_probe,
|
||||
.remove = __devexit_p(snd_mychip_remove),
|
||||
|
@ -1340,7 +1340,7 @@
|
|||
<programlisting>
|
||||
<![CDATA[
|
||||
if (request_irq(pci->irq, snd_mychip_interrupt,
|
||||
IRQF_SHARED, "My Chip", chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
|
||||
snd_mychip_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1616,7 +1616,7 @@
|
|||
<programlisting>
|
||||
<![CDATA[
|
||||
static struct pci_driver driver = {
|
||||
.name = "My Own Chip",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_mychip_ids,
|
||||
.probe = snd_mychip_probe,
|
||||
.remove = __devexit_p(snd_mychip_remove),
|
||||
|
@ -5816,7 +5816,7 @@ struct _snd_pcm_runtime {
|
|||
<programlisting>
|
||||
<![CDATA[
|
||||
static struct pci_driver driver = {
|
||||
.name = "My Chip",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_my_ids,
|
||||
.probe = snd_my_probe,
|
||||
.remove = __devexit_p(snd_my_remove),
|
||||
|
|
|
@ -944,7 +944,7 @@ snd_ad1889_create(struct snd_card *card,
|
|||
spin_lock_init(&chip->lock); /* only now can we call ad1889_free */
|
||||
|
||||
if (request_irq(pci->irq, snd_ad1889_interrupt,
|
||||
IRQF_SHARED, card->driver, chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
|
||||
snd_ad1889_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1055,7 +1055,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = {
|
|||
MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
|
||||
|
||||
static struct pci_driver ad1889_pci_driver = {
|
||||
.name = "AD1889 Audio",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_ad1889_ids,
|
||||
.probe = snd_ad1889_probe,
|
||||
.remove = __devexit_p(snd_ad1889_remove),
|
||||
|
|
|
@ -2090,7 +2090,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec)
|
|||
codec->port = pci_resource_start(codec->pci, 0);
|
||||
|
||||
if (request_irq(codec->pci->irq, snd_ali_card_interrupt,
|
||||
IRQF_SHARED, "ALI 5451", codec)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, codec)) {
|
||||
snd_printk(KERN_ERR "Unable to request irq.\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -2295,7 +2295,7 @@ static void __devexit snd_ali_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ALI 5451",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_ali_ids,
|
||||
.probe = snd_ali_probe,
|
||||
.remove = __devexit_p(snd_ali_remove),
|
||||
|
|
|
@ -722,7 +722,7 @@ static int __devinit snd_als300_create(struct snd_card *card,
|
|||
irq_handler = snd_als300_interrupt;
|
||||
|
||||
if (request_irq(pci->irq, irq_handler, IRQF_SHARED,
|
||||
card->shortname, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_als300_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -846,7 +846,7 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ALS300",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_als300_ids,
|
||||
.probe = snd_als300_probe,
|
||||
.remove = __devexit_p(snd_als300_remove),
|
||||
|
|
|
@ -1036,7 +1036,7 @@ static int snd_als4000_resume(struct pci_dev *pci)
|
|||
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ALS4000",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_als4000_ids,
|
||||
.probe = snd_card_als4000_probe,
|
||||
.remove = __devexit_p(snd_card_als4000_remove),
|
||||
|
|
|
@ -2924,7 +2924,7 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {
|
|||
MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "asihpi",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = asihpi_pci_tbl,
|
||||
.probe = snd_asihpi_probe,
|
||||
.remove = __devexit_p(snd_asihpi_remove),
|
||||
|
|
|
@ -1624,7 +1624,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
|
||||
card->shortname, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_atiixp_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1701,7 +1701,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ATI IXP AC97 controller",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_atiixp_ids,
|
||||
.probe = snd_atiixp_probe,
|
||||
.remove = __devexit_p(snd_atiixp_remove),
|
||||
|
|
|
@ -1260,7 +1260,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
|
||||
card->shortname, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_atiixp_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1332,7 +1332,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ATI IXP MC97 controller",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_atiixp_ids,
|
||||
.probe = snd_atiixp_probe,
|
||||
.remove = __devexit_p(snd_atiixp_remove),
|
||||
|
|
|
@ -196,7 +196,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
|
|||
}
|
||||
|
||||
if ((err = request_irq(pci->irq, vortex_interrupt,
|
||||
IRQF_SHARED, CARD_NAME_SHORT,
|
||||
IRQF_SHARED, KBUILD_MODNAME,
|
||||
chip)) != 0) {
|
||||
printk(KERN_ERR "cannot grab irq\n");
|
||||
goto irq_out;
|
||||
|
@ -375,7 +375,7 @@ static void __devexit snd_vortex_remove(struct pci_dev *pci)
|
|||
|
||||
// pci_driver definition
|
||||
static struct pci_driver driver = {
|
||||
.name = CARD_NAME_SHORT,
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_vortex_ids,
|
||||
.probe = snd_vortex_probe,
|
||||
.remove = __devexit_p(snd_vortex_remove),
|
||||
|
|
|
@ -171,7 +171,7 @@ MODULE_DEVICE_TABLE(pci, snd_aw2_ids);
|
|||
|
||||
/* pci_driver definition */
|
||||
static struct pci_driver driver = {
|
||||
.name = "Emagic Audiowerk 2",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_aw2_ids,
|
||||
.probe = snd_aw2_probe,
|
||||
.remove = __devexit_p(snd_aw2_remove),
|
||||
|
@ -317,7 +317,7 @@ static int __devinit snd_aw2_create(struct snd_card *card,
|
|||
snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
|
||||
|
||||
if (request_irq(pci->irq, snd_aw2_saa7146_interrupt,
|
||||
IRQF_SHARED, "Audiowerk2", chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci->irq);
|
||||
|
||||
iounmap(chip->iobase_virt);
|
||||
|
|
|
@ -2559,7 +2559,7 @@ snd_azf3328_create(struct snd_card *card,
|
|||
codec_setup->name = "I2S_OUT";
|
||||
|
||||
if (request_irq(pci->irq, snd_azf3328_interrupt,
|
||||
IRQF_SHARED, card->shortname, chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
err = -EBUSY;
|
||||
goto out_err;
|
||||
|
@ -2860,7 +2860,7 @@ snd_azf3328_resume(struct pci_dev *pci)
|
|||
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "AZF3328",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_azf3328_ids,
|
||||
.probe = snd_azf3328_probe,
|
||||
.remove = __devexit_p(snd_azf3328_remove),
|
||||
|
|
|
@ -760,7 +760,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
|
|||
snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
|
||||
|
||||
err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
|
||||
"Bt87x audio", chip);
|
||||
KBUILD_MODNAME, chip);
|
||||
if (err < 0) {
|
||||
snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
|
||||
goto fail;
|
||||
|
@ -965,7 +965,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
|
|||
};
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Bt87x",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_bt87x_ids,
|
||||
.probe = snd_bt87x_probe,
|
||||
.remove = __devexit_p(snd_bt87x_remove),
|
||||
|
|
|
@ -1666,7 +1666,7 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_ca0106_interrupt,
|
||||
IRQF_SHARED, "snd_ca0106", chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
snd_ca0106_free(chip);
|
||||
printk(KERN_ERR "cannot grab irq\n");
|
||||
return -EBUSY;
|
||||
|
@ -1933,7 +1933,7 @@ MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
|
|||
|
||||
// pci_driver definition
|
||||
static struct pci_driver driver = {
|
||||
.name = "CA0106",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_ca0106_ids,
|
||||
.probe = snd_ca0106_probe,
|
||||
.remove = __devexit_p(snd_ca0106_remove),
|
||||
|
|
|
@ -3053,7 +3053,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
|
|||
cm->iobase = pci_resource_start(pci, 0);
|
||||
|
||||
if (request_irq(pci->irq, snd_cmipci_interrupt,
|
||||
IRQF_SHARED, card->driver, cm)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, cm)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_cmipci_free(cm);
|
||||
return -EBUSY;
|
||||
|
@ -3398,7 +3398,7 @@ static int snd_cmipci_resume(struct pci_dev *pci)
|
|||
#endif /* CONFIG_PM */
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "C-Media PCI",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_cmipci_ids,
|
||||
.probe = snd_cmipci_probe,
|
||||
.remove = __devexit_p(snd_cmipci_remove),
|
||||
|
|
|
@ -1382,7 +1382,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED,
|
||||
"CS4281", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_cs4281_free(chip);
|
||||
return -ENOMEM;
|
||||
|
@ -2085,7 +2085,7 @@ static int cs4281_resume(struct pci_dev *pci)
|
|||
#endif /* CONFIG_PM */
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "CS4281",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_cs4281_ids,
|
||||
.probe = snd_cs4281_probe,
|
||||
.remove = __devexit_p(snd_cs4281_remove),
|
||||
|
|
|
@ -162,7 +162,7 @@ static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Sound Fusion CS46xx",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_cs46xx_ids,
|
||||
.probe = snd_card_cs46xx_probe,
|
||||
.remove = __devexit_p(snd_card_cs46xx_remove),
|
||||
|
|
|
@ -3835,7 +3835,7 @@ int __devinit snd_cs46xx_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_SHARED,
|
||||
"CS46XX", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_cs46xx_free(chip);
|
||||
return -EBUSY;
|
||||
|
|
|
@ -285,7 +285,7 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "CS5530_Audio",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_cs5530_ids,
|
||||
.probe = snd_cs5530_probe,
|
||||
.remove = __devexit_p(snd_cs5530_remove),
|
||||
|
|
|
@ -311,7 +311,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
|
|||
cs5535au->port = pci_resource_start(pci, 0);
|
||||
|
||||
if (request_irq(pci->irq, snd_cs5535audio_interrupt,
|
||||
IRQF_SHARED, "CS5535 Audio", cs5535au)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, cs5535au)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
err = -EBUSY;
|
||||
goto sndfail;
|
||||
|
@ -395,7 +395,7 @@ static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_cs5535audio_ids,
|
||||
.probe = snd_cs5535audio_probe,
|
||||
.remove = __devexit_p(snd_cs5535audio_remove),
|
||||
|
|
|
@ -1940,7 +1940,7 @@ static int hw_card_start(struct hw *hw)
|
|||
|
||||
if (hw->irq < 0) {
|
||||
err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED,
|
||||
"ctxfi", hw);
|
||||
KBUILD_MODNAME, hw);
|
||||
if (err < 0) {
|
||||
printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
|
||||
goto error2;
|
||||
|
|
|
@ -2064,7 +2064,7 @@ static int hw_card_start(struct hw *hw)
|
|||
|
||||
if (hw->irq < 0) {
|
||||
err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
|
||||
"ctxfi", hw);
|
||||
KBUILD_MODNAME, hw);
|
||||
if (err < 0) {
|
||||
printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
|
||||
goto error2;
|
||||
|
|
|
@ -143,7 +143,7 @@ static int ct_card_resume(struct pci_dev *pci)
|
|||
#endif
|
||||
|
||||
static struct pci_driver ct_driver = {
|
||||
.name = "SB-XFi",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = ct_pci_dev_ids,
|
||||
.probe = ct_card_probe,
|
||||
.remove = __devexit_p(ct_card_remove),
|
||||
|
|
|
@ -1995,7 +1995,7 @@ static __devinit int snd_echo_create(struct snd_card *card,
|
|||
ioremap_nocache(chip->dsp_registers_phys, sz);
|
||||
|
||||
if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
|
||||
ECHOCARD_NAME, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_echo_free(chip);
|
||||
snd_printk(KERN_ERR "cannot grab irq\n");
|
||||
return -EBUSY;
|
||||
|
@ -2286,7 +2286,7 @@ static int snd_echo_resume(struct pci_dev *pci)
|
|||
kfree(commpage_bak);
|
||||
|
||||
if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
|
||||
ECHOCARD_NAME, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_echo_free(chip);
|
||||
snd_printk(KERN_ERR "cannot grab irq\n");
|
||||
return -EBUSY;
|
||||
|
@ -2327,7 +2327,7 @@ static void __devexit snd_echo_remove(struct pci_dev *pci)
|
|||
|
||||
/* pci_driver definition */
|
||||
static struct pci_driver driver = {
|
||||
.name = "Echoaudio " ECHOCARD_NAME,
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_echo_ids,
|
||||
.probe = snd_echo_probe,
|
||||
.remove = __devexit_p(snd_echo_remove),
|
||||
|
|
|
@ -264,7 +264,7 @@ static int snd_emu10k1_resume(struct pci_dev *pci)
|
|||
#endif
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "EMU10K1_Audigy",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_emu10k1_ids,
|
||||
.probe = snd_card_emu10k1_probe,
|
||||
.remove = __devexit_p(snd_card_emu10k1_remove),
|
||||
|
|
|
@ -1912,7 +1912,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
|
|||
|
||||
/* irq handler must be registered after I/O ports are activated */
|
||||
if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
|
||||
"EMU10K1", emu)) {
|
||||
KBUILD_MODNAME, emu)) {
|
||||
err = -EBUSY;
|
||||
goto error;
|
||||
}
|
||||
|
|
|
@ -925,7 +925,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_emu10k1x_interrupt,
|
||||
IRQF_SHARED, "EMU10K1X", chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
|
||||
snd_emu10k1x_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1613,7 +1613,7 @@ MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
|
|||
|
||||
// pci_driver definition
|
||||
static struct pci_driver driver = {
|
||||
.name = "EMU10K1X",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_emu10k1x_ids,
|
||||
.probe = snd_emu10k1x_probe,
|
||||
.remove = __devexit_p(snd_emu10k1x_remove),
|
||||
|
|
|
@ -2120,7 +2120,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
|
|||
}
|
||||
ensoniq->port = pci_resource_start(pci, 0);
|
||||
if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
|
||||
"Ensoniq AudioPCI", ensoniq)) {
|
||||
KBUILD_MODNAME, ensoniq)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_ensoniq_free(ensoniq);
|
||||
return -EBUSY;
|
||||
|
@ -2489,7 +2489,7 @@ static void __devexit snd_audiopci_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_audiopci_ids,
|
||||
.probe = snd_audiopci_probe,
|
||||
.remove = __devexit_p(snd_audiopci_remove),
|
||||
|
|
|
@ -1514,7 +1514,7 @@ static int es1938_resume(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_es1938_interrupt,
|
||||
IRQF_SHARED, "ES1938", chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "es1938: unable to grab IRQ %d, "
|
||||
"disabling device\n", pci->irq);
|
||||
snd_card_disconnect(card);
|
||||
|
@ -1636,7 +1636,7 @@ static int __devinit snd_es1938_create(struct snd_card *card,
|
|||
chip->mpu_port = pci_resource_start(pci, 3);
|
||||
chip->game_port = pci_resource_start(pci, 4);
|
||||
if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED,
|
||||
"ES1938", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_es1938_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1882,7 +1882,7 @@ static void __devexit snd_es1938_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ESS ES1938 (Solo-1)",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_es1938_ids,
|
||||
.probe = snd_es1938_probe,
|
||||
.remove = __devexit_p(snd_es1938_remove),
|
||||
|
|
|
@ -2746,7 +2746,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
|
|||
}
|
||||
chip->io_port = pci_resource_start(pci, 0);
|
||||
if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED,
|
||||
"ESS Maestro", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_es1968_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -2925,7 +2925,7 @@ static void __devexit snd_es1968_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ES1968 (ESS Maestro)",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_es1968_ids,
|
||||
.probe = snd_es1968_probe,
|
||||
.remove = __devexit_p(snd_es1968_remove),
|
||||
|
|
|
@ -1199,7 +1199,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
|
|||
chip->port = pci_resource_start(pci, 0);
|
||||
if ((tea575x_tuner & TUNER_ONLY) == 0) {
|
||||
if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED,
|
||||
"FM801", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
|
||||
snd_fm801_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1394,7 +1394,7 @@ static int snd_fm801_resume(struct pci_dev *pci)
|
|||
#endif
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "FM801",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_fm801_ids,
|
||||
.probe = snd_card_fm801_probe,
|
||||
.remove = __devexit_p(snd_card_fm801_remove),
|
||||
|
|
|
@ -2149,7 +2149,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
|
|||
{
|
||||
if (request_irq(chip->pci->irq, azx_interrupt,
|
||||
chip->msi ? 0 : IRQF_SHARED,
|
||||
"hda_intel", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
|
||||
"disabling device\n", chip->pci->irq);
|
||||
if (do_disconnect)
|
||||
|
@ -2908,7 +2908,7 @@ MODULE_DEVICE_TABLE(pci, azx_ids);
|
|||
|
||||
/* pci_driver definition */
|
||||
static struct pci_driver driver = {
|
||||
.name = "HDA Intel",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = azx_ids,
|
||||
.probe = azx_probe,
|
||||
.remove = __devexit_p(azx_remove),
|
||||
|
|
|
@ -2607,7 +2607,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
|
|||
ice->profi_port = pci_resource_start(pci, 3);
|
||||
|
||||
if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED,
|
||||
"ICE1712", ice)) {
|
||||
KBUILD_MODNAME, ice)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_ice1712_free(ice);
|
||||
return -EIO;
|
||||
|
@ -2802,7 +2802,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ICE1712",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_ice1712_ids,
|
||||
.probe = snd_ice1712_probe,
|
||||
.remove = __devexit_p(snd_ice1712_remove),
|
||||
|
|
|
@ -2509,7 +2509,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
|
|||
ice->profi_port = pci_resource_start(pci, 1);
|
||||
|
||||
if (request_irq(pci->irq, snd_vt1724_interrupt,
|
||||
IRQF_SHARED, "ICE1724", ice)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, ice)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_vt1724_free(ice);
|
||||
return -EIO;
|
||||
|
@ -2802,7 +2802,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
|
|||
#endif
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "ICE1724",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_vt1724_ids,
|
||||
.probe = snd_vt1724_probe,
|
||||
.remove = __devexit_p(snd_vt1724_remove),
|
||||
|
|
|
@ -2647,7 +2647,7 @@ static int intel8x0_resume(struct pci_dev *pci)
|
|||
pci_set_master(pci);
|
||||
snd_intel8x0_chip_init(chip, 0);
|
||||
if (request_irq(pci->irq, snd_intel8x0_interrupt,
|
||||
IRQF_SHARED, card->shortname, chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
|
||||
"disabling device\n", pci->irq);
|
||||
snd_card_disconnect(card);
|
||||
|
@ -3106,7 +3106,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
|
|||
|
||||
/* request irq after initializaing int_sta_mask, etc */
|
||||
if (request_irq(pci->irq, snd_intel8x0_interrupt,
|
||||
IRQF_SHARED, card->shortname, chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_intel8x0_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -3266,7 +3266,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Intel ICH",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_intel8x0_ids,
|
||||
.probe = snd_intel8x0_probe,
|
||||
.remove = __devexit_p(snd_intel8x0_remove),
|
||||
|
|
|
@ -1047,7 +1047,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
|
|||
}
|
||||
pci_set_master(pci);
|
||||
if (request_irq(pci->irq, snd_intel8x0m_interrupt,
|
||||
IRQF_SHARED, card->shortname, chip)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "
|
||||
"disabling device\n", pci->irq);
|
||||
snd_card_disconnect(card);
|
||||
|
@ -1174,7 +1174,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
|
|||
|
||||
port_inited:
|
||||
if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED,
|
||||
card->shortname, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_intel8x0m_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1325,7 +1325,7 @@ static void __devexit snd_intel8x0m_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Intel ICH Modem",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_intel8x0m_ids,
|
||||
.probe = snd_intel8x0m_probe,
|
||||
.remove = __devexit_p(snd_intel8x0m_remove),
|
||||
|
|
|
@ -2241,7 +2241,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *
|
|||
|
||||
err = request_irq(pci->irq, snd_korg1212_interrupt,
|
||||
IRQF_SHARED,
|
||||
"korg1212", korg1212);
|
||||
KBUILD_MODNAME, korg1212);
|
||||
|
||||
if (err) {
|
||||
snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci->irq);
|
||||
|
@ -2477,7 +2477,7 @@ static void __devexit snd_korg1212_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "korg1212",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_korg1212_ids,
|
||||
.probe = snd_korg1212_probe,
|
||||
.remove = __devexit_p(snd_korg1212_remove),
|
||||
|
|
|
@ -648,7 +648,7 @@ static int __devinit lola_create(struct snd_card *card, struct pci_dev *pci,
|
|||
goto errout;
|
||||
|
||||
if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED,
|
||||
DRVNAME, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq);
|
||||
err = -EBUSY;
|
||||
goto errout;
|
||||
|
@ -771,7 +771,7 @@ MODULE_DEVICE_TABLE(pci, lola_ids);
|
|||
|
||||
/* pci_driver definition */
|
||||
static struct pci_driver driver = {
|
||||
.name = DRVNAME,
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = lola_ids,
|
||||
.probe = lola_probe,
|
||||
.remove = __devexit_p(lola_remove),
|
||||
|
|
|
@ -1031,7 +1031,7 @@ static int __devinit snd_lx6464es_create(struct snd_card *card,
|
|||
chip->port_dsp_bar = pci_ioremap_bar(pci, 2);
|
||||
|
||||
err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED,
|
||||
card_name, chip);
|
||||
KBUILD_MODNAME, chip);
|
||||
if (err) {
|
||||
snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq);
|
||||
goto request_irq_failed;
|
||||
|
@ -1137,7 +1137,7 @@ static void __devexit snd_lx6464es_remove(struct pci_dev *pci)
|
|||
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Digigram LX6464ES",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_lx6464es_ids,
|
||||
.probe = snd_lx6464es_probe,
|
||||
.remove = __devexit_p(snd_lx6464es_remove),
|
||||
|
|
|
@ -2757,7 +2757,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
|
|||
#endif
|
||||
|
||||
if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
|
||||
card->driver, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_m3_free(chip);
|
||||
return -ENOMEM;
|
||||
|
@ -2885,7 +2885,7 @@ static void __devexit snd_m3_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Maestro3",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_m3_ids,
|
||||
.probe = snd_m3_probe,
|
||||
.remove = __devexit_p(snd_m3_remove),
|
||||
|
|
|
@ -1268,7 +1268,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED,
|
||||
CARD_NAME, mgr)) {
|
||||
KBUILD_MODNAME, mgr)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_mixart_free(mgr);
|
||||
return -EBUSY;
|
||||
|
@ -1381,7 +1381,7 @@ static void __devexit snd_mixart_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Digigram miXart",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_mixart_ids,
|
||||
.probe = snd_mixart_probe,
|
||||
.remove = __devexit_p(snd_mixart_remove),
|
||||
|
|
|
@ -465,7 +465,7 @@ static int snd_nm256_acquire_irq(struct nm256 *chip)
|
|||
mutex_lock(&chip->irq_mutex);
|
||||
if (chip->irq < 0) {
|
||||
if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED,
|
||||
chip->card->driver, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
|
||||
mutex_unlock(&chip->irq_mutex);
|
||||
return -EBUSY;
|
||||
|
@ -1743,7 +1743,7 @@ static void __devexit snd_nm256_remove(struct pci_dev *pci)
|
|||
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "NeoMagic 256",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_nm256_ids,
|
||||
.probe = snd_nm256_probe,
|
||||
.remove = __devexit_p(snd_nm256_remove),
|
||||
|
|
|
@ -859,7 +859,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
|
|||
}
|
||||
|
||||
static struct pci_driver oxygen_driver = {
|
||||
.name = "CMI8788",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = oxygen_ids,
|
||||
.probe = generic_oxygen_probe,
|
||||
.remove = __devexit_p(oxygen_pci_remove),
|
||||
|
|
|
@ -655,7 +655,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
|
|||
chip->model.init(chip);
|
||||
|
||||
err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
|
||||
DRIVER, chip);
|
||||
KBUILD_MODNAME, chip);
|
||||
if (err < 0) {
|
||||
snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
|
||||
goto err_card;
|
||||
|
|
|
@ -88,7 +88,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
|
|||
}
|
||||
|
||||
static struct pci_driver xonar_driver = {
|
||||
.name = "AV200",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = xonar_ids,
|
||||
.probe = xonar_probe,
|
||||
.remove = __devexit_p(oxygen_pci_remove),
|
||||
|
|
|
@ -1501,7 +1501,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
|
|||
mgr->irq = -1;
|
||||
|
||||
if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED,
|
||||
card_name, mgr)) {
|
||||
KBUILD_MODNAME, mgr)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
pcxhr_free(mgr);
|
||||
return -EBUSY;
|
||||
|
@ -1608,7 +1608,7 @@ static void __devexit pcxhr_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Digigram pcxhr",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = pcxhr_ids,
|
||||
.probe = pcxhr_probe,
|
||||
.remove = __devexit_p(pcxhr_remove),
|
||||
|
|
|
@ -1890,7 +1890,7 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci,
|
|||
UNSET_AIE(hwport);
|
||||
|
||||
if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED,
|
||||
"RIPTIDE", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
|
||||
pci->irq);
|
||||
snd_riptide_free(chip);
|
||||
|
@ -2176,7 +2176,7 @@ static void __devexit snd_card_riptide_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "RIPTIDE",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_riptide_ids,
|
||||
.probe = snd_card_riptide_probe,
|
||||
.remove = __devexit_p(snd_card_riptide_remove),
|
||||
|
@ -2188,7 +2188,7 @@ static struct pci_driver driver = {
|
|||
|
||||
#ifdef SUPPORT_JOYSTICK
|
||||
static struct pci_driver joystick_driver = {
|
||||
.name = "Riptide Joystick",
|
||||
.name = KBUILD_MODNAME "-joystick",
|
||||
.id_table = snd_riptide_joystick_ids,
|
||||
.probe = snd_riptide_joystick_probe,
|
||||
.remove = __devexit_p(snd_riptide_joystick_remove),
|
||||
|
|
|
@ -1355,7 +1355,7 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED,
|
||||
"RME32", rme32)) {
|
||||
KBUILD_MODNAME, rme32)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -1985,7 +1985,7 @@ static void __devexit snd_rme32_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "RME Digi32",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_rme32_ids,
|
||||
.probe = snd_rme32_probe,
|
||||
.remove = __devexit_p(snd_rme32_remove),
|
||||
|
|
|
@ -1561,7 +1561,7 @@ snd_rme96_create(struct rme96 *rme96)
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED,
|
||||
"RME96", rme96)) {
|
||||
KBUILD_MODNAME, rme96)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -2396,7 +2396,7 @@ static void __devexit snd_rme96_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "RME Digi96",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_rme96_ids,
|
||||
.probe = snd_rme96_probe,
|
||||
.remove = __devexit_p(snd_rme96_remove),
|
||||
|
|
|
@ -5482,7 +5482,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_SHARED,
|
||||
"hdsp", hdsp)) {
|
||||
KBUILD_MODNAME, hdsp)) {
|
||||
snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -5637,7 +5637,7 @@ static void __devexit snd_hdsp_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "RME Hammerfall DSP",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_hdsp_ids,
|
||||
.probe = snd_hdsp_probe,
|
||||
.remove = __devexit_p(snd_hdsp_remove),
|
||||
|
|
|
@ -6441,7 +6441,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
|
|||
hdspm->port + io_extent - 1);
|
||||
|
||||
if (request_irq(pci->irq, snd_hdspm_interrupt,
|
||||
IRQF_SHARED, "hdspm", hdspm)) {
|
||||
IRQF_SHARED, KBUILD_MODNAME, hdspm)) {
|
||||
snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -6779,7 +6779,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "RME Hammerfall DSP MADI",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_hdspm_ids,
|
||||
.probe = snd_hdspm_probe,
|
||||
.remove = __devexit_p(snd_hdspm_remove),
|
||||
|
|
|
@ -2479,7 +2479,7 @@ static int __devinit snd_rme9652_create(struct snd_card *card,
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED,
|
||||
"rme9652", rme9652)) {
|
||||
KBUILD_MODNAME, rme9652)) {
|
||||
snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
@ -2632,7 +2632,7 @@ static void __devexit snd_rme9652_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "RME Digi9652 (Hammerfall)",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_rme9652_ids,
|
||||
.probe = snd_rme9652_probe,
|
||||
.remove = __devexit_p(snd_rme9652_remove),
|
||||
|
|
|
@ -1235,7 +1235,7 @@ static int sis_resume(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED,
|
||||
card->shortname, sis)) {
|
||||
KBUILD_MODNAME, sis)) {
|
||||
printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq);
|
||||
goto error;
|
||||
}
|
||||
|
@ -1341,7 +1341,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
|
|||
goto error_out_cleanup;
|
||||
|
||||
if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED,
|
||||
card->shortname, sis)) {
|
||||
KBUILD_MODNAME, sis)) {
|
||||
printk(KERN_ERR "unable to allocate irq %d\n", sis->irq);
|
||||
goto error_out_cleanup;
|
||||
}
|
||||
|
@ -1436,7 +1436,7 @@ static void __devexit snd_sis7019_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver sis7019_driver = {
|
||||
.name = "SiS7019",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_sis7019_ids,
|
||||
.probe = snd_sis7019_probe,
|
||||
.remove = __devexit_p(snd_sis7019_remove),
|
||||
|
|
|
@ -1294,7 +1294,7 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
|
|||
sonic->game_port = pci_resource_start(pci, 4);
|
||||
|
||||
if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED,
|
||||
"S3 SonicVibes", sonic)) {
|
||||
KBUILD_MODNAME, sonic)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_sonicvibes_free(sonic);
|
||||
return -EBUSY;
|
||||
|
@ -1530,7 +1530,7 @@ static void __devexit snd_sonic_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "S3 SonicVibes",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_sonic_ids,
|
||||
.probe = snd_sonic_probe,
|
||||
.remove = __devexit_p(snd_sonic_remove),
|
||||
|
|
|
@ -172,7 +172,7 @@ static void __devexit snd_trident_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Trident4DWaveAudio",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_trident_ids,
|
||||
.probe = snd_trident_probe,
|
||||
.remove = __devexit_p(snd_trident_remove),
|
||||
|
|
|
@ -3598,7 +3598,7 @@ int __devinit snd_trident_create(struct snd_card *card,
|
|||
trident->port = pci_resource_start(pci, 0);
|
||||
|
||||
if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED,
|
||||
"Trident Audio", trident)) {
|
||||
KBUILD_MODNAME, trident)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_trident_free(trident);
|
||||
return -EBUSY;
|
||||
|
|
|
@ -2377,7 +2377,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
|
|||
chip_type == TYPE_VIA8233 ?
|
||||
snd_via8233_interrupt : snd_via686_interrupt,
|
||||
IRQF_SHARED,
|
||||
card->driver, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_via82xx_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -2611,7 +2611,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "VIA 82xx Audio",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_via82xx_ids,
|
||||
.probe = snd_via82xx_probe,
|
||||
.remove = __devexit_p(snd_via82xx_remove),
|
||||
|
|
|
@ -1129,7 +1129,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
|
|||
}
|
||||
chip->port = pci_resource_start(pci, 0);
|
||||
if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED,
|
||||
card->driver, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_via82xx_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -1224,7 +1224,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "VIA 82xx Modem",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_via82xx_modem_ids,
|
||||
.probe = snd_via82xx_probe,
|
||||
.remove = __devexit_p(snd_via82xx_remove),
|
||||
|
|
|
@ -169,7 +169,7 @@ static int __devinit snd_vx222_create(struct snd_card *card, struct pci_dev *pci
|
|||
vx->port[i] = pci_resource_start(pci, i + 1);
|
||||
|
||||
if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED,
|
||||
CARD_NAME, chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_vx222_free(chip);
|
||||
return -EBUSY;
|
||||
|
@ -290,7 +290,7 @@ static int snd_vx222_resume(struct pci_dev *pci)
|
|||
#endif
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Digigram VX222",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_vx222_ids,
|
||||
.probe = snd_vx222_probe,
|
||||
.remove = __devexit_p(snd_vx222_remove),
|
||||
|
|
|
@ -345,7 +345,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
|
|||
}
|
||||
|
||||
static struct pci_driver driver = {
|
||||
.name = "Yamaha DS-1 PCI",
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_ymfpci_ids,
|
||||
.probe = snd_card_ymfpci_probe,
|
||||
.remove = __devexit_p(snd_card_ymfpci_remove),
|
||||
|
|
|
@ -2380,7 +2380,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
|
|||
return -EBUSY;
|
||||
}
|
||||
if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED,
|
||||
"YMFPCI", chip)) {
|
||||
KBUILD_MODNAME, chip)) {
|
||||
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
|
||||
snd_ymfpci_free(chip);
|
||||
return -EBUSY;
|
||||
|
|
Loading…
Reference in a new issue