Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'test/pci-rename' into topic/misc

This commit is contained in:
Takashi Iwai 2011-06-14 08:56:42 +02:00
parent b028b81835 ce1fd36932
commit 85e4d95da0
60 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/DocBook/writing-an-alsa-driver.tmpl
View File

@ -1164,7 +1164,7 @@
} }
chip->port = pci_resource_start(pci, 0); chip->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_mychip_interrupt, 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); printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip); snd_mychip_free(chip);
return -EBUSY; return -EBUSY;
@ -1197,7 +1197,7 @@
/* pci_driver definition */ /* pci_driver definition */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "My Own Chip", .name = KBUILD_MODNAME,
.id_table = snd_mychip_ids, .id_table = snd_mychip_ids,
.probe = snd_mychip_probe, .probe = snd_mychip_probe,
.remove = __devexit_p(snd_mychip_remove), .remove = __devexit_p(snd_mychip_remove),
@ -1340,7 +1340,7 @@
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
if (request_irq(pci->irq, snd_mychip_interrupt, 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); printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip); snd_mychip_free(chip);
return -EBUSY; return -EBUSY;
@ -1616,7 +1616,7 @@
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "My Own Chip", .name = KBUILD_MODNAME,
.id_table = snd_mychip_ids, .id_table = snd_mychip_ids,
.probe = snd_mychip_probe, .probe = snd_mychip_probe,
.remove = __devexit_p(snd_mychip_remove), .remove = __devexit_p(snd_mychip_remove),
@ -5816,7 +5816,7 @@ struct _snd_pcm_runtime {
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "My Chip", .name = KBUILD_MODNAME,
.id_table = snd_my_ids, .id_table = snd_my_ids,
.probe = snd_my_probe, .probe = snd_my_probe,
.remove = __devexit_p(snd_my_remove), .remove = __devexit_p(snd_my_remove),

4
sound/pci/ad1889.c
View File

@ -944,7 +944,7 @@ snd_ad1889_create(struct snd_card *card,
spin_lock_init(&chip->lock); /* only now can we call ad1889_free */ spin_lock_init(&chip->lock); /* only now can we call ad1889_free */
if (request_irq(pci->irq, snd_ad1889_interrupt, 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); printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
snd_ad1889_free(chip); snd_ad1889_free(chip);
return -EBUSY; return -EBUSY;
@ -1055,7 +1055,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = {
MODULE_DEVICE_TABLE(pci, snd_ad1889_ids); MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
static struct pci_driver ad1889_pci_driver = { static struct pci_driver ad1889_pci_driver = {
.name = "AD1889 Audio", .name = KBUILD_MODNAME,
.id_table = snd_ad1889_ids, .id_table = snd_ad1889_ids,
.probe = snd_ad1889_probe, .probe = snd_ad1889_probe,
.remove = __devexit_p(snd_ad1889_remove), .remove = __devexit_p(snd_ad1889_remove),

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

@ -2090,7 +2090,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec)
codec->port = pci_resource_start(codec->pci, 0); codec->port = pci_resource_start(codec->pci, 0);
if (request_irq(codec->pci->irq, snd_ali_card_interrupt, 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"); snd_printk(KERN_ERR "Unable to request irq.\n");
return -EBUSY; return -EBUSY;
} }
@ -2295,7 +2295,7 @@ static void __devexit snd_ali_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ALI 5451", .name = KBUILD_MODNAME,
.id_table = snd_ali_ids, .id_table = snd_ali_ids,
.probe = snd_ali_probe, .probe = snd_ali_probe,
.remove = __devexit_p(snd_ali_remove), .remove = __devexit_p(snd_ali_remove),

4
sound/pci/als300.c
View File

@ -722,7 +722,7 @@ static int __devinit snd_als300_create(struct snd_card *card,
irq_handler = snd_als300_interrupt; irq_handler = snd_als300_interrupt;
if (request_irq(pci->irq, irq_handler, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_als300_free(chip); snd_als300_free(chip);
return -EBUSY; return -EBUSY;
@ -846,7 +846,7 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ALS300", .name = KBUILD_MODNAME,
.id_table = snd_als300_ids, .id_table = snd_als300_ids,
.probe = snd_als300_probe, .probe = snd_als300_probe,
.remove = __devexit_p(snd_als300_remove), .remove = __devexit_p(snd_als300_remove),

2
sound/pci/als4000.c
View File

@ -1036,7 +1036,7 @@ static int snd_als4000_resume(struct pci_dev *pci)
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ALS4000", .name = KBUILD_MODNAME,
.id_table = snd_als4000_ids, .id_table = snd_als4000_ids,
.probe = snd_card_als4000_probe, .probe = snd_card_als4000_probe,
.remove = __devexit_p(snd_card_als4000_remove), .remove = __devexit_p(snd_card_als4000_remove),

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

@ -2924,7 +2924,7 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {
MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl); MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "asihpi", .name = KBUILD_MODNAME,
.id_table = asihpi_pci_tbl, .id_table = asihpi_pci_tbl,
.probe = snd_asihpi_probe, .probe = snd_asihpi_probe,
.remove = __devexit_p(snd_asihpi_remove), .remove = __devexit_p(snd_asihpi_remove),

4
sound/pci/atiixp.c
View File

@ -1624,7 +1624,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_atiixp_free(chip); snd_atiixp_free(chip);
return -EBUSY; return -EBUSY;
@ -1701,7 +1701,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ATI IXP AC97 controller", .name = KBUILD_MODNAME,
.id_table = snd_atiixp_ids, .id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe, .probe = snd_atiixp_probe,
.remove = __devexit_p(snd_atiixp_remove), .remove = __devexit_p(snd_atiixp_remove),

4
sound/pci/atiixp_modem.c
View File

@ -1260,7 +1260,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_atiixp_free(chip); snd_atiixp_free(chip);
return -EBUSY; return -EBUSY;
@ -1332,7 +1332,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ATI IXP MC97 controller", .name = KBUILD_MODNAME,
.id_table = snd_atiixp_ids, .id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe, .probe = snd_atiixp_probe,
.remove = __devexit_p(snd_atiixp_remove), .remove = __devexit_p(snd_atiixp_remove),

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

@ -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, if ((err = request_irq(pci->irq, vortex_interrupt,
IRQF_SHARED, CARD_NAME_SHORT, IRQF_SHARED, KBUILD_MODNAME,
chip)) != 0) { chip)) != 0) {
printk(KERN_ERR "cannot grab irq\n"); printk(KERN_ERR "cannot grab irq\n");
goto irq_out; goto irq_out;
@ -375,7 +375,7 @@ static void __devexit snd_vortex_remove(struct pci_dev *pci)
// pci_driver definition // pci_driver definition
static struct pci_driver driver = { static struct pci_driver driver = {
.name = CARD_NAME_SHORT, .name = KBUILD_MODNAME,
.id_table = snd_vortex_ids, .id_table = snd_vortex_ids,
.probe = snd_vortex_probe, .probe = snd_vortex_probe,
.remove = __devexit_p(snd_vortex_remove), .remove = __devexit_p(snd_vortex_remove),

4
sound/pci/aw2/aw2-alsa.c
View File

@ -171,7 +171,7 @@ MODULE_DEVICE_TABLE(pci, snd_aw2_ids);
/* pci_driver definition */ /* pci_driver definition */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Emagic Audiowerk 2", .name = KBUILD_MODNAME,
.id_table = snd_aw2_ids, .id_table = snd_aw2_ids,
.probe = snd_aw2_probe, .probe = snd_aw2_probe,
.remove = __devexit_p(snd_aw2_remove), .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); snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, 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); printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci->irq);
iounmap(chip->iobase_virt); iounmap(chip->iobase_virt);

4
sound/pci/azt3328.c
View File

@ -2559,7 +2559,7 @@ snd_azf3328_create(struct snd_card *card,
codec_setup->name = "I2S_OUT"; codec_setup->name = "I2S_OUT";
if (request_irq(pci->irq, snd_azf3328_interrupt, 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); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
err = -EBUSY; err = -EBUSY;
goto out_err; goto out_err;
@ -2860,7 +2860,7 @@ snd_azf3328_resume(struct pci_dev *pci)
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "AZF3328", .name = KBUILD_MODNAME,
.id_table = snd_azf3328_ids, .id_table = snd_azf3328_ids,
.probe = snd_azf3328_probe, .probe = snd_azf3328_probe,
.remove = __devexit_p(snd_azf3328_remove), .remove = __devexit_p(snd_azf3328_remove),

4
sound/pci/bt87x.c
View File

@ -760,7 +760,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS); snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED, err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
"Bt87x audio", chip); KBUILD_MODNAME, chip);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq); snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
goto fail; goto fail;
@ -965,7 +965,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
}; };
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Bt87x", .name = KBUILD_MODNAME,
.id_table = snd_bt87x_ids, .id_table = snd_bt87x_ids,
.probe = snd_bt87x_probe, .probe = snd_bt87x_probe,
.remove = __devexit_p(snd_bt87x_remove), .remove = __devexit_p(snd_bt87x_remove),

4
sound/pci/ca0106/ca0106_main.c
View File

@ -1666,7 +1666,7 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
} }
if (request_irq(pci->irq, snd_ca0106_interrupt, if (request_irq(pci->irq, snd_ca0106_interrupt,
IRQF_SHARED, "snd_ca0106", chip)) { IRQF_SHARED, KBUILD_MODNAME, chip)) {
snd_ca0106_free(chip); snd_ca0106_free(chip);
printk(KERN_ERR "cannot grab irq\n"); printk(KERN_ERR "cannot grab irq\n");
return -EBUSY; return -EBUSY;
@ -1933,7 +1933,7 @@ MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
// pci_driver definition // pci_driver definition
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "CA0106", .name = KBUILD_MODNAME,
.id_table = snd_ca0106_ids, .id_table = snd_ca0106_ids,
.probe = snd_ca0106_probe, .probe = snd_ca0106_probe,
.remove = __devexit_p(snd_ca0106_remove), .remove = __devexit_p(snd_ca0106_remove),

4
sound/pci/cmipci.c
View File

@ -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); cm->iobase = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_cmipci_interrupt, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_cmipci_free(cm); snd_cmipci_free(cm);
return -EBUSY; return -EBUSY;
@ -3398,7 +3398,7 @@ static int snd_cmipci_resume(struct pci_dev *pci)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "C-Media PCI", .name = KBUILD_MODNAME,
.id_table = snd_cmipci_ids, .id_table = snd_cmipci_ids,
.probe = snd_cmipci_probe, .probe = snd_cmipci_probe,
.remove = __devexit_p(snd_cmipci_remove), .remove = __devexit_p(snd_cmipci_remove),

4
sound/pci/cs4281.c
View File

@ -1382,7 +1382,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_cs4281_free(chip); snd_cs4281_free(chip);
return -ENOMEM; return -ENOMEM;
@ -2085,7 +2085,7 @@ static int cs4281_resume(struct pci_dev *pci)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "CS4281", .name = KBUILD_MODNAME,
.id_table = snd_cs4281_ids, .id_table = snd_cs4281_ids,
.probe = snd_cs4281_probe, .probe = snd_cs4281_probe,
.remove = __devexit_p(snd_cs4281_remove), .remove = __devexit_p(snd_cs4281_remove),

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

@ -162,7 +162,7 @@ static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Sound Fusion CS46xx", .name = KBUILD_MODNAME,
.id_table = snd_cs46xx_ids, .id_table = snd_cs46xx_ids,
.probe = snd_card_cs46xx_probe, .probe = snd_card_cs46xx_probe,
.remove = __devexit_p(snd_card_cs46xx_remove), .remove = __devexit_p(snd_card_cs46xx_remove),

2
sound/pci/cs46xx/cs46xx_lib.c
View File

@ -3835,7 +3835,7 @@ int __devinit snd_cs46xx_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_cs46xx_free(chip); snd_cs46xx_free(chip);
return -EBUSY; return -EBUSY;

2
sound/pci/cs5530.c
View File

@ -285,7 +285,7 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "CS5530_Audio", .name = KBUILD_MODNAME,
.id_table = snd_cs5530_ids, .id_table = snd_cs5530_ids,
.probe = snd_cs5530_probe, .probe = snd_cs5530_probe,
.remove = __devexit_p(snd_cs5530_remove), .remove = __devexit_p(snd_cs5530_remove),

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

@ -311,7 +311,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
cs5535au->port = pci_resource_start(pci, 0); cs5535au->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_cs5535audio_interrupt, 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); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
err = -EBUSY; err = -EBUSY;
goto sndfail; goto sndfail;
@ -395,7 +395,7 @@ static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = DRIVER_NAME, .name = KBUILD_MODNAME,
.id_table = snd_cs5535audio_ids, .id_table = snd_cs5535audio_ids,
.probe = snd_cs5535audio_probe, .probe = snd_cs5535audio_probe,
.remove = __devexit_p(snd_cs5535audio_remove), .remove = __devexit_p(snd_cs5535audio_remove),

2
sound/pci/ctxfi/cthw20k1.c
View File

@ -1940,7 +1940,7 @@ static int hw_card_start(struct hw *hw)
if (hw->irq < 0) { if (hw->irq < 0) {
err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED,
"ctxfi", hw); KBUILD_MODNAME, hw);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
goto error2; goto error2;

2
sound/pci/ctxfi/cthw20k2.c
View File

@ -2064,7 +2064,7 @@ static int hw_card_start(struct hw *hw)
if (hw->irq < 0) { if (hw->irq < 0) {
err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
"ctxfi", hw); KBUILD_MODNAME, hw);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
goto error2; goto error2;

2
sound/pci/ctxfi/xfi.c
View File

@ -143,7 +143,7 @@ static int ct_card_resume(struct pci_dev *pci)
#endif #endif
static struct pci_driver ct_driver = { static struct pci_driver ct_driver = {
.name = "SB-XFi", .name = KBUILD_MODNAME,
.id_table = ct_pci_dev_ids, .id_table = ct_pci_dev_ids,
.probe = ct_card_probe, .probe = ct_card_probe,
.remove = __devexit_p(ct_card_remove), .remove = __devexit_p(ct_card_remove),

6
sound/pci/echoaudio/echoaudio.c
View File

@ -1995,7 +1995,7 @@ static __devinit int snd_echo_create(struct snd_card *card,
ioremap_nocache(chip->dsp_registers_phys, sz); ioremap_nocache(chip->dsp_registers_phys, sz);
if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
ECHOCARD_NAME, chip)) { KBUILD_MODNAME, chip)) {
snd_echo_free(chip); snd_echo_free(chip);
snd_printk(KERN_ERR "cannot grab irq\n"); snd_printk(KERN_ERR "cannot grab irq\n");
return -EBUSY; return -EBUSY;
@ -2286,7 +2286,7 @@ static int snd_echo_resume(struct pci_dev *pci)
kfree(commpage_bak); kfree(commpage_bak);
if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
ECHOCARD_NAME, chip)) { KBUILD_MODNAME, chip)) {
snd_echo_free(chip); snd_echo_free(chip);
snd_printk(KERN_ERR "cannot grab irq\n"); snd_printk(KERN_ERR "cannot grab irq\n");
return -EBUSY; return -EBUSY;
@ -2327,7 +2327,7 @@ static void __devexit snd_echo_remove(struct pci_dev *pci)
/* pci_driver definition */ /* pci_driver definition */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Echoaudio " ECHOCARD_NAME, .name = KBUILD_MODNAME,
.id_table = snd_echo_ids, .id_table = snd_echo_ids,
.probe = snd_echo_probe, .probe = snd_echo_probe,
.remove = __devexit_p(snd_echo_remove), .remove = __devexit_p(snd_echo_remove),

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

@ -264,7 +264,7 @@ static int snd_emu10k1_resume(struct pci_dev *pci)
#endif #endif
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "EMU10K1_Audigy", .name = KBUILD_MODNAME,
.id_table = snd_emu10k1_ids, .id_table = snd_emu10k1_ids,
.probe = snd_card_emu10k1_probe, .probe = snd_card_emu10k1_probe,
.remove = __devexit_p(snd_card_emu10k1_remove), .remove = __devexit_p(snd_card_emu10k1_remove),

2
sound/pci/emu10k1/emu10k1_main.c
View File

@ -1912,7 +1912,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
/* irq handler must be registered after I/O ports are activated */ /* irq handler must be registered after I/O ports are activated */
if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
"EMU10K1", emu)) { KBUILD_MODNAME, emu)) {
err = -EBUSY; err = -EBUSY;
goto error; goto error;
} }

4
sound/pci/emu10k1/emu10k1x.c
View File

@ -925,7 +925,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_emu10k1x_interrupt, 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_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
snd_emu10k1x_free(chip); snd_emu10k1x_free(chip);
return -EBUSY; return -EBUSY;
@ -1613,7 +1613,7 @@ MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
// pci_driver definition // pci_driver definition
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "EMU10K1X", .name = KBUILD_MODNAME,
.id_table = snd_emu10k1x_ids, .id_table = snd_emu10k1x_ids,
.probe = snd_emu10k1x_probe, .probe = snd_emu10k1x_probe,
.remove = __devexit_p(snd_emu10k1x_remove), .remove = __devexit_p(snd_emu10k1x_remove),

4
sound/pci/ens1370.c
View File

@ -2120,7 +2120,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
} }
ensoniq->port = pci_resource_start(pci, 0); ensoniq->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_ensoniq_free(ensoniq); snd_ensoniq_free(ensoniq);
return -EBUSY; return -EBUSY;
@ -2489,7 +2489,7 @@ static void __devexit snd_audiopci_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = DRIVER_NAME, .name = KBUILD_MODNAME,
.id_table = snd_audiopci_ids, .id_table = snd_audiopci_ids,
.probe = snd_audiopci_probe, .probe = snd_audiopci_probe,
.remove = __devexit_p(snd_audiopci_remove), .remove = __devexit_p(snd_audiopci_remove),

6
sound/pci/es1938.c
View File

@ -1514,7 +1514,7 @@ static int es1938_resume(struct pci_dev *pci)
} }
if (request_irq(pci->irq, snd_es1938_interrupt, 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, " printk(KERN_ERR "es1938: unable to grab IRQ %d, "
"disabling device\n", pci->irq); "disabling device\n", pci->irq);
snd_card_disconnect(card); 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->mpu_port = pci_resource_start(pci, 3);
chip->game_port = pci_resource_start(pci, 4); chip->game_port = pci_resource_start(pci, 4);
if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_es1938_free(chip); snd_es1938_free(chip);
return -EBUSY; return -EBUSY;
@ -1882,7 +1882,7 @@ static void __devexit snd_es1938_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ESS ES1938 (Solo-1)", .name = KBUILD_MODNAME,
.id_table = snd_es1938_ids, .id_table = snd_es1938_ids,
.probe = snd_es1938_probe, .probe = snd_es1938_probe,
.remove = __devexit_p(snd_es1938_remove), .remove = __devexit_p(snd_es1938_remove),

4
sound/pci/es1968.c
View File

@ -2746,7 +2746,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
} }
chip->io_port = pci_resource_start(pci, 0); chip->io_port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_es1968_free(chip); snd_es1968_free(chip);
return -EBUSY; return -EBUSY;
@ -2925,7 +2925,7 @@ static void __devexit snd_es1968_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ES1968 (ESS Maestro)", .name = KBUILD_MODNAME,
.id_table = snd_es1968_ids, .id_table = snd_es1968_ids,
.probe = snd_es1968_probe, .probe = snd_es1968_probe,
.remove = __devexit_p(snd_es1968_remove), .remove = __devexit_p(snd_es1968_remove),

4
sound/pci/fm801.c
View File

@ -1199,7 +1199,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
chip->port = pci_resource_start(pci, 0); chip->port = pci_resource_start(pci, 0);
if ((tea575x_tuner & TUNER_ONLY) == 0) { if ((tea575x_tuner & TUNER_ONLY) == 0) {
if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
snd_fm801_free(chip); snd_fm801_free(chip);
return -EBUSY; return -EBUSY;
@ -1394,7 +1394,7 @@ static int snd_fm801_resume(struct pci_dev *pci)
#endif #endif
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "FM801", .name = KBUILD_MODNAME,
.id_table = snd_fm801_ids, .id_table = snd_fm801_ids,
.probe = snd_card_fm801_probe, .probe = snd_card_fm801_probe,
.remove = __devexit_p(snd_card_fm801_remove), .remove = __devexit_p(snd_card_fm801_remove),

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

@ -2149,7 +2149,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
{ {
if (request_irq(chip->pci->irq, azx_interrupt, if (request_irq(chip->pci->irq, azx_interrupt,
chip->msi ? 0 : IRQF_SHARED, chip->msi ? 0 : IRQF_SHARED,
"hda_intel", chip)) { KBUILD_MODNAME, chip)) {
printk(KERN_ERR "hda-intel: unable to grab IRQ %d, " printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
"disabling device\n", chip->pci->irq); "disabling device\n", chip->pci->irq);
if (do_disconnect) if (do_disconnect)
@ -2908,7 +2908,7 @@ MODULE_DEVICE_TABLE(pci, azx_ids);
/* pci_driver definition */ /* pci_driver definition */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "HDA Intel", .name = KBUILD_MODNAME,
.id_table = azx_ids, .id_table = azx_ids,
.probe = azx_probe, .probe = azx_probe,
.remove = __devexit_p(azx_remove), .remove = __devexit_p(azx_remove),

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

@ -2607,7 +2607,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
ice->profi_port = pci_resource_start(pci, 3); ice->profi_port = pci_resource_start(pci, 3);
if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_ice1712_free(ice); snd_ice1712_free(ice);
return -EIO; return -EIO;
@ -2802,7 +2802,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ICE1712", .name = KBUILD_MODNAME,
.id_table = snd_ice1712_ids, .id_table = snd_ice1712_ids,
.probe = snd_ice1712_probe, .probe = snd_ice1712_probe,
.remove = __devexit_p(snd_ice1712_remove), .remove = __devexit_p(snd_ice1712_remove),

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

@ -2509,7 +2509,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
ice->profi_port = pci_resource_start(pci, 1); ice->profi_port = pci_resource_start(pci, 1);
if (request_irq(pci->irq, snd_vt1724_interrupt, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_vt1724_free(ice); snd_vt1724_free(ice);
return -EIO; return -EIO;
@ -2802,7 +2802,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
#endif #endif
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "ICE1724", .name = KBUILD_MODNAME,
.id_table = snd_vt1724_ids, .id_table = snd_vt1724_ids,
.probe = snd_vt1724_probe, .probe = snd_vt1724_probe,
.remove = __devexit_p(snd_vt1724_remove), .remove = __devexit_p(snd_vt1724_remove),

6
sound/pci/intel8x0.c
View File

@ -2647,7 +2647,7 @@ static int intel8x0_resume(struct pci_dev *pci)
pci_set_master(pci); pci_set_master(pci);
snd_intel8x0_chip_init(chip, 0); snd_intel8x0_chip_init(chip, 0);
if (request_irq(pci->irq, snd_intel8x0_interrupt, 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, " printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
"disabling device\n", pci->irq); "disabling device\n", pci->irq);
snd_card_disconnect(card); 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 */ /* request irq after initializaing int_sta_mask, etc */
if (request_irq(pci->irq, snd_intel8x0_interrupt, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_intel8x0_free(chip); snd_intel8x0_free(chip);
return -EBUSY; return -EBUSY;
@ -3266,7 +3266,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Intel ICH", .name = KBUILD_MODNAME,
.id_table = snd_intel8x0_ids, .id_table = snd_intel8x0_ids,
.probe = snd_intel8x0_probe, .probe = snd_intel8x0_probe,
.remove = __devexit_p(snd_intel8x0_remove), .remove = __devexit_p(snd_intel8x0_remove),

6
sound/pci/intel8x0m.c
View File

@ -1047,7 +1047,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
} }
pci_set_master(pci); pci_set_master(pci);
if (request_irq(pci->irq, snd_intel8x0m_interrupt, 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, " printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "
"disabling device\n", pci->irq); "disabling device\n", pci->irq);
snd_card_disconnect(card); snd_card_disconnect(card);
@ -1174,7 +1174,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
port_inited: port_inited:
if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_intel8x0m_free(chip); snd_intel8x0m_free(chip);
return -EBUSY; return -EBUSY;
@ -1325,7 +1325,7 @@ static void __devexit snd_intel8x0m_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Intel ICH Modem", .name = KBUILD_MODNAME,
.id_table = snd_intel8x0m_ids, .id_table = snd_intel8x0m_ids,
.probe = snd_intel8x0m_probe, .probe = snd_intel8x0m_probe,
.remove = __devexit_p(snd_intel8x0m_remove), .remove = __devexit_p(snd_intel8x0m_remove),

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

@ -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, err = request_irq(pci->irq, snd_korg1212_interrupt,
IRQF_SHARED, IRQF_SHARED,
"korg1212", korg1212); KBUILD_MODNAME, korg1212);
if (err) { if (err) {
snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci->irq); 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 = { static struct pci_driver driver = {
.name = "korg1212", .name = KBUILD_MODNAME,
.id_table = snd_korg1212_ids, .id_table = snd_korg1212_ids,
.probe = snd_korg1212_probe, .probe = snd_korg1212_probe,
.remove = __devexit_p(snd_korg1212_remove), .remove = __devexit_p(snd_korg1212_remove),

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

@ -648,7 +648,7 @@ static int __devinit lola_create(struct snd_card *card, struct pci_dev *pci,
goto errout; goto errout;
if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED, 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); printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq);
err = -EBUSY; err = -EBUSY;
goto errout; goto errout;
@ -771,7 +771,7 @@ MODULE_DEVICE_TABLE(pci, lola_ids);
/* pci_driver definition */ /* pci_driver definition */
static struct pci_driver driver = { static struct pci_driver driver = {
.name = DRVNAME, .name = KBUILD_MODNAME,
.id_table = lola_ids, .id_table = lola_ids,
.probe = lola_probe, .probe = lola_probe,
.remove = __devexit_p(lola_remove), .remove = __devexit_p(lola_remove),

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

@ -1031,7 +1031,7 @@ static int __devinit snd_lx6464es_create(struct snd_card *card,
chip->port_dsp_bar = pci_ioremap_bar(pci, 2); chip->port_dsp_bar = pci_ioremap_bar(pci, 2);
err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED, err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED,
card_name, chip); KBUILD_MODNAME, chip);
if (err) { if (err) {
snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq); snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq);
goto request_irq_failed; goto request_irq_failed;
@ -1137,7 +1137,7 @@ static void __devexit snd_lx6464es_remove(struct pci_dev *pci)
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Digigram LX6464ES", .name = KBUILD_MODNAME,
.id_table = snd_lx6464es_ids, .id_table = snd_lx6464es_ids,
.probe = snd_lx6464es_probe, .probe = snd_lx6464es_probe,
.remove = __devexit_p(snd_lx6464es_remove), .remove = __devexit_p(snd_lx6464es_remove),

4
sound/pci/maestro3.c
View File

@ -2757,7 +2757,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
#endif #endif
if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_m3_free(chip); snd_m3_free(chip);
return -ENOMEM; return -ENOMEM;
@ -2885,7 +2885,7 @@ static void __devexit snd_m3_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Maestro3", .name = KBUILD_MODNAME,
.id_table = snd_m3_ids, .id_table = snd_m3_ids,
.probe = snd_m3_probe, .probe = snd_m3_probe,
.remove = __devexit_p(snd_m3_remove), .remove = __devexit_p(snd_m3_remove),

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

@ -1268,7 +1268,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
} }
if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_mixart_free(mgr); snd_mixart_free(mgr);
return -EBUSY; return -EBUSY;
@ -1381,7 +1381,7 @@ static void __devexit snd_mixart_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Digigram miXart", .name = KBUILD_MODNAME,
.id_table = snd_mixart_ids, .id_table = snd_mixart_ids,
.probe = snd_mixart_probe, .probe = snd_mixart_probe,
.remove = __devexit_p(snd_mixart_remove), .remove = __devexit_p(snd_mixart_remove),

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

@ -465,7 +465,7 @@ static int snd_nm256_acquire_irq(struct nm256 *chip)
mutex_lock(&chip->irq_mutex); mutex_lock(&chip->irq_mutex);
if (chip->irq < 0) { if (chip->irq < 0) {
if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED, 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); snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
mutex_unlock(&chip->irq_mutex); mutex_unlock(&chip->irq_mutex);
return -EBUSY; return -EBUSY;
@ -1743,7 +1743,7 @@ static void __devexit snd_nm256_remove(struct pci_dev *pci)
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "NeoMagic 256", .name = KBUILD_MODNAME,
.id_table = snd_nm256_ids, .id_table = snd_nm256_ids,
.probe = snd_nm256_probe, .probe = snd_nm256_probe,
.remove = __devexit_p(snd_nm256_remove), .remove = __devexit_p(snd_nm256_remove),

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

@ -859,7 +859,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
} }
static struct pci_driver oxygen_driver = { static struct pci_driver oxygen_driver = {
.name = "CMI8788", .name = KBUILD_MODNAME,
.id_table = oxygen_ids, .id_table = oxygen_ids,
.probe = generic_oxygen_probe, .probe = generic_oxygen_probe,
.remove = __devexit_p(oxygen_pci_remove), .remove = __devexit_p(oxygen_pci_remove),

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

@ -655,7 +655,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
chip->model.init(chip); chip->model.init(chip);
err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED, err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
DRIVER, chip); KBUILD_MODNAME, chip);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq); snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
goto err_card; goto err_card;

2
sound/pci/oxygen/virtuoso.c
View File

@ -88,7 +88,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
} }
static struct pci_driver xonar_driver = { static struct pci_driver xonar_driver = {
.name = "AV200", .name = KBUILD_MODNAME,
.id_table = xonar_ids, .id_table = xonar_ids,
.probe = xonar_probe, .probe = xonar_probe,
.remove = __devexit_p(oxygen_pci_remove), .remove = __devexit_p(oxygen_pci_remove),

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

@ -1501,7 +1501,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
mgr->irq = -1; mgr->irq = -1;
if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED, 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); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
pcxhr_free(mgr); pcxhr_free(mgr);
return -EBUSY; return -EBUSY;
@ -1608,7 +1608,7 @@ static void __devexit pcxhr_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Digigram pcxhr", .name = KBUILD_MODNAME,
.id_table = pcxhr_ids, .id_table = pcxhr_ids,
.probe = pcxhr_probe, .probe = pcxhr_probe,
.remove = __devexit_p(pcxhr_remove), .remove = __devexit_p(pcxhr_remove),

6
sound/pci/riptide/riptide.c
View File

@ -1890,7 +1890,7 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci,
UNSET_AIE(hwport); UNSET_AIE(hwport);
if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED, 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", snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
pci->irq); pci->irq);
snd_riptide_free(chip); snd_riptide_free(chip);
@ -2176,7 +2176,7 @@ static void __devexit snd_card_riptide_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "RIPTIDE", .name = KBUILD_MODNAME,
.id_table = snd_riptide_ids, .id_table = snd_riptide_ids,
.probe = snd_card_riptide_probe, .probe = snd_card_riptide_probe,
.remove = __devexit_p(snd_card_riptide_remove), .remove = __devexit_p(snd_card_riptide_remove),
@ -2188,7 +2188,7 @@ static struct pci_driver driver = {
#ifdef SUPPORT_JOYSTICK #ifdef SUPPORT_JOYSTICK
static struct pci_driver joystick_driver = { static struct pci_driver joystick_driver = {
.name = "Riptide Joystick", .name = KBUILD_MODNAME "-joystick",
.id_table = snd_riptide_joystick_ids, .id_table = snd_riptide_joystick_ids,
.probe = snd_riptide_joystick_probe, .probe = snd_riptide_joystick_probe,
.remove = __devexit_p(snd_riptide_joystick_remove), .remove = __devexit_p(snd_riptide_joystick_remove),

4
sound/pci/rme32.c
View File

@ -1355,7 +1355,7 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
} }
if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED, 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); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
return -EBUSY; return -EBUSY;
} }
@ -1985,7 +1985,7 @@ static void __devexit snd_rme32_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "RME Digi32", .name = KBUILD_MODNAME,
.id_table = snd_rme32_ids, .id_table = snd_rme32_ids,
.probe = snd_rme32_probe, .probe = snd_rme32_probe,
.remove = __devexit_p(snd_rme32_remove), .remove = __devexit_p(snd_rme32_remove),

4
sound/pci/rme96.c
View File

@ -1561,7 +1561,7 @@ snd_rme96_create(struct rme96 *rme96)
} }
if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED, 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); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
return -EBUSY; return -EBUSY;
} }
@ -2396,7 +2396,7 @@ static void __devexit snd_rme96_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "RME Digi96", .name = KBUILD_MODNAME,
.id_table = snd_rme96_ids, .id_table = snd_rme96_ids,
.probe = snd_rme96_probe, .probe = snd_rme96_probe,
.remove = __devexit_p(snd_rme96_remove), .remove = __devexit_p(snd_rme96_remove),

4
sound/pci/rme9652/hdsp.c
View File

@ -5482,7 +5482,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_SHARED, 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); snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq);
return -EBUSY; return -EBUSY;
} }
@ -5637,7 +5637,7 @@ static void __devexit snd_hdsp_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "RME Hammerfall DSP", .name = KBUILD_MODNAME,
.id_table = snd_hdsp_ids, .id_table = snd_hdsp_ids,
.probe = snd_hdsp_probe, .probe = snd_hdsp_probe,
.remove = __devexit_p(snd_hdsp_remove), .remove = __devexit_p(snd_hdsp_remove),

4
sound/pci/rme9652/hdspm.c
View File

@ -6441,7 +6441,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
hdspm->port + io_extent - 1); hdspm->port + io_extent - 1);
if (request_irq(pci->irq, snd_hdspm_interrupt, 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); snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
return -EBUSY; return -EBUSY;
} }
@ -6779,7 +6779,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "RME Hammerfall DSP MADI", .name = KBUILD_MODNAME,
.id_table = snd_hdspm_ids, .id_table = snd_hdspm_ids,
.probe = snd_hdspm_probe, .probe = snd_hdspm_probe,
.remove = __devexit_p(snd_hdspm_remove), .remove = __devexit_p(snd_hdspm_remove),

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

@ -2479,7 +2479,7 @@ static int __devinit snd_rme9652_create(struct snd_card *card,
} }
if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED, 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); snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq);
return -EBUSY; return -EBUSY;
} }
@ -2632,7 +2632,7 @@ static void __devexit snd_rme9652_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "RME Digi9652 (Hammerfall)", .name = KBUILD_MODNAME,
.id_table = snd_rme9652_ids, .id_table = snd_rme9652_ids,
.probe = snd_rme9652_probe, .probe = snd_rme9652_probe,
.remove = __devexit_p(snd_rme9652_remove), .remove = __devexit_p(snd_rme9652_remove),

6
sound/pci/sis7019.c
View File

@ -1235,7 +1235,7 @@ static int sis_resume(struct pci_dev *pci)
} }
if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, 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); printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq);
goto error; goto error;
} }
@ -1341,7 +1341,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
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_DISABLED|IRQF_SHARED,
card->shortname, 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;
} }
@ -1436,7 +1436,7 @@ static void __devexit snd_sis7019_remove(struct pci_dev *pci)
} }
static struct pci_driver sis7019_driver = { static struct pci_driver sis7019_driver = {
.name = "SiS7019", .name = KBUILD_MODNAME,
.id_table = snd_sis7019_ids, .id_table = snd_sis7019_ids,
.probe = snd_sis7019_probe, .probe = snd_sis7019_probe,
.remove = __devexit_p(snd_sis7019_remove), .remove = __devexit_p(snd_sis7019_remove),

4
sound/pci/sonicvibes.c
View File

@ -1294,7 +1294,7 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
sonic->game_port = pci_resource_start(pci, 4); sonic->game_port = pci_resource_start(pci, 4);
if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_sonicvibes_free(sonic); snd_sonicvibes_free(sonic);
return -EBUSY; return -EBUSY;
@ -1530,7 +1530,7 @@ static void __devexit snd_sonic_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "S3 SonicVibes", .name = KBUILD_MODNAME,
.id_table = snd_sonic_ids, .id_table = snd_sonic_ids,
.probe = snd_sonic_probe, .probe = snd_sonic_probe,
.remove = __devexit_p(snd_sonic_remove), .remove = __devexit_p(snd_sonic_remove),

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

@ -172,7 +172,7 @@ static void __devexit snd_trident_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Trident4DWaveAudio", .name = KBUILD_MODNAME,
.id_table = snd_trident_ids, .id_table = snd_trident_ids,
.probe = snd_trident_probe, .probe = snd_trident_probe,
.remove = __devexit_p(snd_trident_remove), .remove = __devexit_p(snd_trident_remove),

2
sound/pci/trident/trident_main.c
View File

@ -3598,7 +3598,7 @@ int __devinit snd_trident_create(struct snd_card *card,
trident->port = pci_resource_start(pci, 0); trident->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_trident_free(trident); snd_trident_free(trident);
return -EBUSY; return -EBUSY;

4
sound/pci/via82xx.c
View File

@ -2377,7 +2377,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
chip_type == TYPE_VIA8233 ? chip_type == TYPE_VIA8233 ?
snd_via8233_interrupt : snd_via686_interrupt, snd_via8233_interrupt : snd_via686_interrupt,
IRQF_SHARED, IRQF_SHARED,
card->driver, chip)) { KBUILD_MODNAME, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_via82xx_free(chip); snd_via82xx_free(chip);
return -EBUSY; return -EBUSY;
@ -2611,7 +2611,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "VIA 82xx Audio", .name = KBUILD_MODNAME,
.id_table = snd_via82xx_ids, .id_table = snd_via82xx_ids,
.probe = snd_via82xx_probe, .probe = snd_via82xx_probe,
.remove = __devexit_p(snd_via82xx_remove), .remove = __devexit_p(snd_via82xx_remove),

4
sound/pci/via82xx_modem.c
View File

@ -1129,7 +1129,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
} }
chip->port = pci_resource_start(pci, 0); chip->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_via82xx_free(chip); snd_via82xx_free(chip);
return -EBUSY; return -EBUSY;
@ -1224,7 +1224,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "VIA 82xx Modem", .name = KBUILD_MODNAME,
.id_table = snd_via82xx_modem_ids, .id_table = snd_via82xx_modem_ids,
.probe = snd_via82xx_probe, .probe = snd_via82xx_probe,
.remove = __devexit_p(snd_via82xx_remove), .remove = __devexit_p(snd_via82xx_remove),

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

@ -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); vx->port[i] = pci_resource_start(pci, i + 1);
if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_vx222_free(chip); snd_vx222_free(chip);
return -EBUSY; return -EBUSY;
@ -290,7 +290,7 @@ static int snd_vx222_resume(struct pci_dev *pci)
#endif #endif
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Digigram VX222", .name = KBUILD_MODNAME,
.id_table = snd_vx222_ids, .id_table = snd_vx222_ids,
.probe = snd_vx222_probe, .probe = snd_vx222_probe,
.remove = __devexit_p(snd_vx222_remove), .remove = __devexit_p(snd_vx222_remove),

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

@ -345,7 +345,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
} }
static struct pci_driver driver = { static struct pci_driver driver = {
.name = "Yamaha DS-1 PCI", .name = KBUILD_MODNAME,
.id_table = snd_ymfpci_ids, .id_table = snd_ymfpci_ids,
.probe = snd_card_ymfpci_probe, .probe = snd_card_ymfpci_probe,
.remove = __devexit_p(snd_card_ymfpci_remove), .remove = __devexit_p(snd_card_ymfpci_remove),

2
sound/pci/ymfpci/ymfpci_main.c
View File

@ -2380,7 +2380,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
return -EBUSY; return -EBUSY;
} }
if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED, 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_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_ymfpci_free(chip); snd_ymfpci_free(chip);
return -EBUSY; return -EBUSY;