diff options
49 files changed, 54 insertions, 54 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index fe617ee93214..201503673f25 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -944,7 +944,7 @@ snd_ad1889_create(struct snd_card *card, | |||
944 | spin_lock_init(&chip->lock); /* only now can we call ad1889_free */ | 944 | spin_lock_init(&chip->lock); /* only now can we call ad1889_free */ |
945 | 945 | ||
946 | if (request_irq(pci->irq, snd_ad1889_interrupt, | 946 | if (request_irq(pci->irq, snd_ad1889_interrupt, |
947 | IRQF_SHARED, card->driver, chip)) { | 947 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
948 | printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq); | 948 | printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq); |
949 | snd_ad1889_free(chip); | 949 | snd_ad1889_free(chip); |
950 | return -EBUSY; | 950 | return -EBUSY; |
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 2def167d7df6..b444b74d9dcf 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -2090,7 +2090,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec) | |||
2090 | codec->port = pci_resource_start(codec->pci, 0); | 2090 | codec->port = pci_resource_start(codec->pci, 0); |
2091 | 2091 | ||
2092 | if (request_irq(codec->pci->irq, snd_ali_card_interrupt, | 2092 | if (request_irq(codec->pci->irq, snd_ali_card_interrupt, |
2093 | IRQF_SHARED, "ALI 5451", codec)) { | 2093 | IRQF_SHARED, KBUILD_MODNAME, codec)) { |
2094 | snd_printk(KERN_ERR "Unable to request irq.\n"); | 2094 | snd_printk(KERN_ERR "Unable to request irq.\n"); |
2095 | return -EBUSY; | 2095 | return -EBUSY; |
2096 | } | 2096 | } |
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 0958daccd15e..736c8e93db1f 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
@@ -722,7 +722,7 @@ static int __devinit snd_als300_create(struct snd_card *card, | |||
722 | irq_handler = snd_als300_interrupt; | 722 | irq_handler = snd_als300_interrupt; |
723 | 723 | ||
724 | if (request_irq(pci->irq, irq_handler, IRQF_SHARED, | 724 | if (request_irq(pci->irq, irq_handler, IRQF_SHARED, |
725 | card->shortname, chip)) { | 725 | KBUILD_MODNAME, chip)) { |
726 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 726 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
727 | snd_als300_free(chip); | 727 | snd_als300_free(chip); |
728 | return -EBUSY; | 728 | return -EBUSY; |
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 550b574b4734..537e0a2cc68a 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
@@ -1624,7 +1624,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, | |||
1624 | } | 1624 | } |
1625 | 1625 | ||
1626 | if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, | 1626 | if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, |
1627 | card->shortname, chip)) { | 1627 | KBUILD_MODNAME, chip)) { |
1628 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1628 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1629 | snd_atiixp_free(chip); | 1629 | snd_atiixp_free(chip); |
1630 | return -EBUSY; | 1630 | return -EBUSY; |
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 2fef550bef94..45df275c8248 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
@@ -1260,7 +1260,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, | |||
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, | 1262 | if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, |
1263 | card->shortname, chip)) { | 1263 | KBUILD_MODNAME, chip)) { |
1264 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1264 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1265 | snd_atiixp_free(chip); | 1265 | snd_atiixp_free(chip); |
1266 | return -EBUSY; | 1266 | return -EBUSY; |
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 4933e4e9ac87..a38469986885 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c | |||
@@ -196,7 +196,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) | |||
196 | } | 196 | } |
197 | 197 | ||
198 | if ((err = request_irq(pci->irq, vortex_interrupt, | 198 | if ((err = request_irq(pci->irq, vortex_interrupt, |
199 | IRQF_SHARED, CARD_NAME_SHORT, | 199 | IRQF_SHARED, KBUILD_MODNAME, |
200 | chip)) != 0) { | 200 | chip)) != 0) { |
201 | printk(KERN_ERR "cannot grab irq\n"); | 201 | printk(KERN_ERR "cannot grab irq\n"); |
202 | goto irq_out; | 202 | goto irq_out; |
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 8410edb5fbaf..f8569b11331b 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c | |||
@@ -317,7 +317,7 @@ static int __devinit snd_aw2_create(struct snd_card *card, | |||
317 | snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt); | 317 | snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt); |
318 | 318 | ||
319 | if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, | 319 | if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, |
320 | IRQF_SHARED, "Audiowerk2", chip)) { | 320 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
321 | printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci->irq); | 321 | printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci->irq); |
322 | 322 | ||
323 | iounmap(chip->iobase_virt); | 323 | iounmap(chip->iobase_virt); |
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 71d3525719fc..e4d76a270c9f 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -2559,7 +2559,7 @@ snd_azf3328_create(struct snd_card *card, | |||
2559 | codec_setup->name = "I2S_OUT"; | 2559 | codec_setup->name = "I2S_OUT"; |
2560 | 2560 | ||
2561 | if (request_irq(pci->irq, snd_azf3328_interrupt, | 2561 | if (request_irq(pci->irq, snd_azf3328_interrupt, |
2562 | IRQF_SHARED, card->shortname, chip)) { | 2562 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
2563 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2563 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2564 | err = -EBUSY; | 2564 | err = -EBUSY; |
2565 | goto out_err; | 2565 | goto out_err; |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 89428099d811..39180335c237 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -760,7 +760,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card, | |||
760 | snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS); | 760 | snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS); |
761 | 761 | ||
762 | err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED, | 762 | err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED, |
763 | "Bt87x audio", chip); | 763 | KBUILD_MODNAME, chip); |
764 | if (err < 0) { | 764 | if (err < 0) { |
765 | snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq); | 765 | snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq); |
766 | goto fail; | 766 | goto fail; |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 620787509339..061b7e654586 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1666,7 +1666,7 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, | |||
1666 | } | 1666 | } |
1667 | 1667 | ||
1668 | if (request_irq(pci->irq, snd_ca0106_interrupt, | 1668 | if (request_irq(pci->irq, snd_ca0106_interrupt, |
1669 | IRQF_SHARED, "snd_ca0106", chip)) { | 1669 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
1670 | snd_ca0106_free(chip); | 1670 | snd_ca0106_free(chip); |
1671 | printk(KERN_ERR "cannot grab irq\n"); | 1671 | printk(KERN_ERR "cannot grab irq\n"); |
1672 | return -EBUSY; | 1672 | return -EBUSY; |
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 84af5bece127..9cf99fb7eb9c 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -3053,7 +3053,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc | |||
3053 | cm->iobase = pci_resource_start(pci, 0); | 3053 | cm->iobase = pci_resource_start(pci, 0); |
3054 | 3054 | ||
3055 | if (request_irq(pci->irq, snd_cmipci_interrupt, | 3055 | if (request_irq(pci->irq, snd_cmipci_interrupt, |
3056 | IRQF_SHARED, card->driver, cm)) { | 3056 | IRQF_SHARED, KBUILD_MODNAME, cm)) { |
3057 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 3057 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
3058 | snd_cmipci_free(cm); | 3058 | snd_cmipci_free(cm); |
3059 | return -EBUSY; | 3059 | return -EBUSY; |
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 67052d9069cf..07f04e390aa1 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -1382,7 +1382,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card, | |||
1382 | } | 1382 | } |
1383 | 1383 | ||
1384 | if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED, | 1384 | if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED, |
1385 | "CS4281", chip)) { | 1385 | KBUILD_MODNAME, chip)) { |
1386 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1386 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1387 | snd_cs4281_free(chip); | 1387 | snd_cs4281_free(chip); |
1388 | return -ENOMEM; | 1388 | return -ENOMEM; |
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index aad37082cb6e..9546bf07f0d1 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c | |||
@@ -3835,7 +3835,7 @@ int __devinit snd_cs46xx_create(struct snd_card *card, | |||
3835 | } | 3835 | } |
3836 | 3836 | ||
3837 | if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_SHARED, | 3837 | if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_SHARED, |
3838 | "CS46XX", chip)) { | 3838 | KBUILD_MODNAME, chip)) { |
3839 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 3839 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
3840 | snd_cs46xx_free(chip); | 3840 | snd_cs46xx_free(chip); |
3841 | return -EBUSY; | 3841 | return -EBUSY; |
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index a6a877747e71..10d22ed5fece 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c | |||
@@ -311,7 +311,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card, | |||
311 | cs5535au->port = pci_resource_start(pci, 0); | 311 | cs5535au->port = pci_resource_start(pci, 0); |
312 | 312 | ||
313 | if (request_irq(pci->irq, snd_cs5535audio_interrupt, | 313 | if (request_irq(pci->irq, snd_cs5535audio_interrupt, |
314 | IRQF_SHARED, "CS5535 Audio", cs5535au)) { | 314 | IRQF_SHARED, KBUILD_MODNAME, cs5535au)) { |
315 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 315 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
316 | err = -EBUSY; | 316 | err = -EBUSY; |
317 | goto sndfail; | 317 | goto sndfail; |
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index a5c957db5cea..284baf9660eb 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c | |||
@@ -1933,7 +1933,7 @@ static int hw_card_start(struct hw *hw) | |||
1933 | 1933 | ||
1934 | if (hw->irq < 0) { | 1934 | if (hw->irq < 0) { |
1935 | err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, | 1935 | err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, |
1936 | "ctxfi", hw); | 1936 | KBUILD_MODNAME, hw); |
1937 | if (err < 0) { | 1937 | if (err < 0) { |
1938 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); | 1938 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); |
1939 | goto error2; | 1939 | goto error2; |
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index 5364164674e4..64f9ded85bbb 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c | |||
@@ -1925,7 +1925,7 @@ static int hw_card_start(struct hw *hw) | |||
1925 | 1925 | ||
1926 | if (hw->irq < 0) { | 1926 | if (hw->irq < 0) { |
1927 | err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, | 1927 | err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, |
1928 | "ctxfi", hw); | 1928 | KBUILD_MODNAME, hw); |
1929 | if (err < 0) { | 1929 | if (err < 0) { |
1930 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); | 1930 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); |
1931 | goto error2; | 1931 | goto error2; |
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index d302e0f39596..d7306980d0f1 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c | |||
@@ -1995,7 +1995,7 @@ static __devinit int snd_echo_create(struct snd_card *card, | |||
1995 | ioremap_nocache(chip->dsp_registers_phys, sz); | 1995 | ioremap_nocache(chip->dsp_registers_phys, sz); |
1996 | 1996 | ||
1997 | if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, | 1997 | if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, |
1998 | ECHOCARD_NAME, chip)) { | 1998 | KBUILD_MODNAME, chip)) { |
1999 | snd_echo_free(chip); | 1999 | snd_echo_free(chip); |
2000 | snd_printk(KERN_ERR "cannot grab irq\n"); | 2000 | snd_printk(KERN_ERR "cannot grab irq\n"); |
2001 | return -EBUSY; | 2001 | return -EBUSY; |
@@ -2286,7 +2286,7 @@ static int snd_echo_resume(struct pci_dev *pci) | |||
2286 | kfree(commpage_bak); | 2286 | kfree(commpage_bak); |
2287 | 2287 | ||
2288 | if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, | 2288 | if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, |
2289 | ECHOCARD_NAME, chip)) { | 2289 | KBUILD_MODNAME, chip)) { |
2290 | snd_echo_free(chip); | 2290 | snd_echo_free(chip); |
2291 | snd_printk(KERN_ERR "cannot grab irq\n"); | 2291 | snd_printk(KERN_ERR "cannot grab irq\n"); |
2292 | return -EBUSY; | 2292 | return -EBUSY; |
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 5e619a84da06..8733790af90a 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -1904,7 +1904,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
1904 | 1904 | ||
1905 | /* irq handler must be registered after I/O ports are activated */ | 1905 | /* irq handler must be registered after I/O ports are activated */ |
1906 | if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, | 1906 | if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, |
1907 | "EMU10K1", emu)) { | 1907 | KBUILD_MODNAME, emu)) { |
1908 | err = -EBUSY; | 1908 | err = -EBUSY; |
1909 | goto error; | 1909 | goto error; |
1910 | } | 1910 | } |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index c9cb73105525..d4fde1b4b093 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -925,7 +925,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card, | |||
925 | } | 925 | } |
926 | 926 | ||
927 | if (request_irq(pci->irq, snd_emu10k1x_interrupt, | 927 | if (request_irq(pci->irq, snd_emu10k1x_interrupt, |
928 | IRQF_SHARED, "EMU10K1X", chip)) { | 928 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
929 | snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq); | 929 | snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq); |
930 | snd_emu10k1x_free(chip); | 930 | snd_emu10k1x_free(chip); |
931 | return -EBUSY; | 931 | return -EBUSY; |
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index a61dd4229773..f02e2f8d7122 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -2120,7 +2120,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card, | |||
2120 | } | 2120 | } |
2121 | ensoniq->port = pci_resource_start(pci, 0); | 2121 | ensoniq->port = pci_resource_start(pci, 0); |
2122 | if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED, | 2122 | if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED, |
2123 | "Ensoniq AudioPCI", ensoniq)) { | 2123 | KBUILD_MODNAME, ensoniq)) { |
2124 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2124 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2125 | snd_ensoniq_free(ensoniq); | 2125 | snd_ensoniq_free(ensoniq); |
2126 | return -EBUSY; | 2126 | return -EBUSY; |
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 84141d16e701..26a5a2f25d4b 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -1514,7 +1514,7 @@ static int es1938_resume(struct pci_dev *pci) | |||
1514 | } | 1514 | } |
1515 | 1515 | ||
1516 | if (request_irq(pci->irq, snd_es1938_interrupt, | 1516 | if (request_irq(pci->irq, snd_es1938_interrupt, |
1517 | IRQF_SHARED, "ES1938", chip)) { | 1517 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
1518 | printk(KERN_ERR "es1938: unable to grab IRQ %d, " | 1518 | printk(KERN_ERR "es1938: unable to grab IRQ %d, " |
1519 | "disabling device\n", pci->irq); | 1519 | "disabling device\n", pci->irq); |
1520 | snd_card_disconnect(card); | 1520 | snd_card_disconnect(card); |
@@ -1636,7 +1636,7 @@ static int __devinit snd_es1938_create(struct snd_card *card, | |||
1636 | chip->mpu_port = pci_resource_start(pci, 3); | 1636 | chip->mpu_port = pci_resource_start(pci, 3); |
1637 | chip->game_port = pci_resource_start(pci, 4); | 1637 | chip->game_port = pci_resource_start(pci, 4); |
1638 | if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED, | 1638 | if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED, |
1639 | "ES1938", chip)) { | 1639 | KBUILD_MODNAME, chip)) { |
1640 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1640 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1641 | snd_es1938_free(chip); | 1641 | snd_es1938_free(chip); |
1642 | return -EBUSY; | 1642 | return -EBUSY; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 14a2e163fa8c..3fa46593a3b9 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2746,7 +2746,7 @@ static int __devinit snd_es1968_create(struct snd_card *card, | |||
2746 | } | 2746 | } |
2747 | chip->io_port = pci_resource_start(pci, 0); | 2747 | chip->io_port = pci_resource_start(pci, 0); |
2748 | if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, | 2748 | if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, |
2749 | "ESS Maestro", chip)) { | 2749 | KBUILD_MODNAME, chip)) { |
2750 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2750 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2751 | snd_es1968_free(chip); | 2751 | snd_es1968_free(chip); |
2752 | return -EBUSY; | 2752 | return -EBUSY; |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index db3963c4bf88..f9123f09e83e 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
@@ -1199,7 +1199,7 @@ static int __devinit snd_fm801_create(struct snd_card *card, | |||
1199 | chip->port = pci_resource_start(pci, 0); | 1199 | chip->port = pci_resource_start(pci, 0); |
1200 | if ((tea575x_tuner & TUNER_ONLY) == 0) { | 1200 | if ((tea575x_tuner & TUNER_ONLY) == 0) { |
1201 | if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED, | 1201 | if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED, |
1202 | "FM801", chip)) { | 1202 | KBUILD_MODNAME, chip)) { |
1203 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq); | 1203 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq); |
1204 | snd_fm801_free(chip); | 1204 | snd_fm801_free(chip); |
1205 | return -EBUSY; | 1205 | return -EBUSY; |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 29f1d36d6cb0..5cc3d07f715f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -2149,7 +2149,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect) | |||
2149 | { | 2149 | { |
2150 | if (request_irq(chip->pci->irq, azx_interrupt, | 2150 | if (request_irq(chip->pci->irq, azx_interrupt, |
2151 | chip->msi ? 0 : IRQF_SHARED, | 2151 | chip->msi ? 0 : IRQF_SHARED, |
2152 | "hda_intel", chip)) { | 2152 | KBUILD_MODNAME, chip)) { |
2153 | printk(KERN_ERR "hda-intel: unable to grab IRQ %d, " | 2153 | printk(KERN_ERR "hda-intel: unable to grab IRQ %d, " |
2154 | "disabling device\n", chip->pci->irq); | 2154 | "disabling device\n", chip->pci->irq); |
2155 | if (do_disconnect) | 2155 | if (do_disconnect) |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 7410df93769c..be06fb3e45a1 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2607,7 +2607,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card, | |||
2607 | ice->profi_port = pci_resource_start(pci, 3); | 2607 | ice->profi_port = pci_resource_start(pci, 3); |
2608 | 2608 | ||
2609 | if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED, | 2609 | if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED, |
2610 | "ICE1712", ice)) { | 2610 | KBUILD_MODNAME, ice)) { |
2611 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2611 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2612 | snd_ice1712_free(ice); | 2612 | snd_ice1712_free(ice); |
2613 | return -EIO; | 2613 | return -EIO; |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 5e7db8dab1a2..c2b7f8bc41e4 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2509,7 +2509,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card, | |||
2509 | ice->profi_port = pci_resource_start(pci, 1); | 2509 | ice->profi_port = pci_resource_start(pci, 1); |
2510 | 2510 | ||
2511 | if (request_irq(pci->irq, snd_vt1724_interrupt, | 2511 | if (request_irq(pci->irq, snd_vt1724_interrupt, |
2512 | IRQF_SHARED, "ICE1724", ice)) { | 2512 | IRQF_SHARED, KBUILD_MODNAME, ice)) { |
2513 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2513 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2514 | snd_vt1724_free(ice); | 2514 | snd_vt1724_free(ice); |
2515 | return -EIO; | 2515 | return -EIO; |
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index c01a89b78d43..f9acf0f03da2 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -2647,7 +2647,7 @@ static int intel8x0_resume(struct pci_dev *pci) | |||
2647 | pci_set_master(pci); | 2647 | pci_set_master(pci); |
2648 | snd_intel8x0_chip_init(chip, 0); | 2648 | snd_intel8x0_chip_init(chip, 0); |
2649 | if (request_irq(pci->irq, snd_intel8x0_interrupt, | 2649 | if (request_irq(pci->irq, snd_intel8x0_interrupt, |
2650 | IRQF_SHARED, card->shortname, chip)) { | 2650 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
2651 | printk(KERN_ERR "intel8x0: unable to grab IRQ %d, " | 2651 | printk(KERN_ERR "intel8x0: unable to grab IRQ %d, " |
2652 | "disabling device\n", pci->irq); | 2652 | "disabling device\n", pci->irq); |
2653 | snd_card_disconnect(card); | 2653 | snd_card_disconnect(card); |
@@ -3106,7 +3106,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card, | |||
3106 | 3106 | ||
3107 | /* request irq after initializaing int_sta_mask, etc */ | 3107 | /* request irq after initializaing int_sta_mask, etc */ |
3108 | if (request_irq(pci->irq, snd_intel8x0_interrupt, | 3108 | if (request_irq(pci->irq, snd_intel8x0_interrupt, |
3109 | IRQF_SHARED, card->shortname, chip)) { | 3109 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
3110 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 3110 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
3111 | snd_intel8x0_free(chip); | 3111 | snd_intel8x0_free(chip); |
3112 | return -EBUSY; | 3112 | return -EBUSY; |
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 5eed9ebb446b..7c161645d865 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -1047,7 +1047,7 @@ static int intel8x0m_resume(struct pci_dev *pci) | |||
1047 | } | 1047 | } |
1048 | pci_set_master(pci); | 1048 | pci_set_master(pci); |
1049 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, | 1049 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, |
1050 | IRQF_SHARED, card->shortname, chip)) { | 1050 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
1051 | printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, " | 1051 | printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, " |
1052 | "disabling device\n", pci->irq); | 1052 | "disabling device\n", pci->irq); |
1053 | snd_card_disconnect(card); | 1053 | snd_card_disconnect(card); |
@@ -1174,7 +1174,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card, | |||
1174 | 1174 | ||
1175 | port_inited: | 1175 | port_inited: |
1176 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED, | 1176 | if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED, |
1177 | card->shortname, chip)) { | 1177 | KBUILD_MODNAME, chip)) { |
1178 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1178 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1179 | snd_intel8x0m_free(chip); | 1179 | snd_intel8x0m_free(chip); |
1180 | return -EBUSY; | 1180 | return -EBUSY; |
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 544a6cdfa2d5..fc1d573cf306 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
@@ -2241,7 +2241,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev * | |||
2241 | 2241 | ||
2242 | err = request_irq(pci->irq, snd_korg1212_interrupt, | 2242 | err = request_irq(pci->irq, snd_korg1212_interrupt, |
2243 | IRQF_SHARED, | 2243 | IRQF_SHARED, |
2244 | "korg1212", korg1212); | 2244 | KBUILD_MODNAME, korg1212); |
2245 | 2245 | ||
2246 | if (err) { | 2246 | if (err) { |
2247 | snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci->irq); | 2247 | snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci->irq); |
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index 77c5e8675419..1dc6f5b1d668 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c | |||
@@ -648,7 +648,7 @@ static int __devinit lola_create(struct snd_card *card, struct pci_dev *pci, | |||
648 | goto errout; | 648 | goto errout; |
649 | 649 | ||
650 | if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED, | 650 | if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED, |
651 | DRVNAME, chip)) { | 651 | KBUILD_MODNAME, chip)) { |
652 | printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq); | 652 | printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq); |
653 | err = -EBUSY; | 653 | err = -EBUSY; |
654 | goto errout; | 654 | goto errout; |
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index b0bd3c53e876..38ae83951de0 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c | |||
@@ -1031,7 +1031,7 @@ static int __devinit snd_lx6464es_create(struct snd_card *card, | |||
1031 | chip->port_dsp_bar = pci_ioremap_bar(pci, 2); | 1031 | chip->port_dsp_bar = pci_ioremap_bar(pci, 2); |
1032 | 1032 | ||
1033 | err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED, | 1033 | err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED, |
1034 | card_name, chip); | 1034 | KBUILD_MODNAME, chip); |
1035 | if (err) { | 1035 | if (err) { |
1036 | snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq); | 1036 | snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq); |
1037 | goto request_irq_failed; | 1037 | goto request_irq_failed; |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 0499bf8716d0..64f6f627f4c2 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -2757,7 +2757,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, | |||
2757 | #endif | 2757 | #endif |
2758 | 2758 | ||
2759 | if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED, | 2759 | if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED, |
2760 | card->driver, chip)) { | 2760 | KBUILD_MODNAME, chip)) { |
2761 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2761 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2762 | snd_m3_free(chip); | 2762 | snd_m3_free(chip); |
2763 | return -ENOMEM; | 2763 | return -ENOMEM; |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 9d87e44abd6c..dbee59906ae1 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -1268,7 +1268,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, | |||
1268 | } | 1268 | } |
1269 | 1269 | ||
1270 | if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED, | 1270 | if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED, |
1271 | CARD_NAME, mgr)) { | 1271 | KBUILD_MODNAME, mgr)) { |
1272 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1272 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1273 | snd_mixart_free(mgr); | 1273 | snd_mixart_free(mgr); |
1274 | return -EBUSY; | 1274 | return -EBUSY; |
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index fd19b7f936ba..83ea7a7d3eec 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
@@ -465,7 +465,7 @@ static int snd_nm256_acquire_irq(struct nm256 *chip) | |||
465 | mutex_lock(&chip->irq_mutex); | 465 | mutex_lock(&chip->irq_mutex); |
466 | if (chip->irq < 0) { | 466 | if (chip->irq < 0) { |
467 | if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED, | 467 | if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED, |
468 | chip->card->driver, chip)) { | 468 | KBUILD_MODNAME, chip)) { |
469 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq); | 469 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq); |
470 | mutex_unlock(&chip->irq_mutex); | 470 | mutex_unlock(&chip->irq_mutex); |
471 | return -EBUSY; | 471 | return -EBUSY; |
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 70b739816fcc..82311fcb86f6 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -655,7 +655,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
655 | chip->model.init(chip); | 655 | chip->model.init(chip); |
656 | 656 | ||
657 | err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED, | 657 | err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED, |
658 | DRIVER, chip); | 658 | KBUILD_MODNAME, chip); |
659 | if (err < 0) { | 659 | if (err < 0) { |
660 | snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq); | 660 | snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq); |
661 | goto err_card; | 661 | goto err_card; |
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index cb215a01ebb6..046578d26f98 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -1501,7 +1501,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, | |||
1501 | mgr->irq = -1; | 1501 | mgr->irq = -1; |
1502 | 1502 | ||
1503 | if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED, | 1503 | if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED, |
1504 | card_name, mgr)) { | 1504 | KBUILD_MODNAME, mgr)) { |
1505 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1505 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1506 | pcxhr_free(mgr); | 1506 | pcxhr_free(mgr); |
1507 | return -EBUSY; | 1507 | return -EBUSY; |
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 91c0cb69d306..e34ae14908b3 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -1890,7 +1890,7 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci, | |||
1890 | UNSET_AIE(hwport); | 1890 | UNSET_AIE(hwport); |
1891 | 1891 | ||
1892 | if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED, | 1892 | if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED, |
1893 | "RIPTIDE", chip)) { | 1893 | KBUILD_MODNAME, chip)) { |
1894 | snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n", | 1894 | snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n", |
1895 | pci->irq); | 1895 | pci->irq); |
1896 | snd_riptide_free(chip); | 1896 | snd_riptide_free(chip); |
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index c7bcc63097f4..6be77a264d47 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c | |||
@@ -1355,7 +1355,7 @@ static int __devinit snd_rme32_create(struct rme32 * rme32) | |||
1355 | } | 1355 | } |
1356 | 1356 | ||
1357 | if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED, | 1357 | if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED, |
1358 | "RME32", rme32)) { | 1358 | KBUILD_MODNAME, rme32)) { |
1359 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1359 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1360 | return -EBUSY; | 1360 | return -EBUSY; |
1361 | } | 1361 | } |
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index a3646118abb0..409e5b89519d 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -1561,7 +1561,7 @@ snd_rme96_create(struct rme96 *rme96) | |||
1561 | } | 1561 | } |
1562 | 1562 | ||
1563 | if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED, | 1563 | if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED, |
1564 | "RME96", rme96)) { | 1564 | KBUILD_MODNAME, rme96)) { |
1565 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1565 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1566 | return -EBUSY; | 1566 | return -EBUSY; |
1567 | } | 1567 | } |
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index da50c5562942..1c6d1e1c27c1 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -5482,7 +5482,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card, | |||
5482 | } | 5482 | } |
5483 | 5483 | ||
5484 | if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_SHARED, | 5484 | if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_SHARED, |
5485 | "hdsp", hdsp)) { | 5485 | KBUILD_MODNAME, hdsp)) { |
5486 | snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq); | 5486 | snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq); |
5487 | return -EBUSY; | 5487 | return -EBUSY; |
5488 | } | 5488 | } |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 2785f4cef349..32d0c9c35007 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -6437,7 +6437,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card, | |||
6437 | hdspm->port + io_extent - 1); | 6437 | hdspm->port + io_extent - 1); |
6438 | 6438 | ||
6439 | if (request_irq(pci->irq, snd_hdspm_interrupt, | 6439 | if (request_irq(pci->irq, snd_hdspm_interrupt, |
6440 | IRQF_SHARED, "hdspm", hdspm)) { | 6440 | IRQF_SHARED, KBUILD_MODNAME, hdspm)) { |
6441 | snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq); | 6441 | snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq); |
6442 | return -EBUSY; | 6442 | return -EBUSY; |
6443 | } | 6443 | } |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 9646a8422a85..1c7bc1ef8186 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -2479,7 +2479,7 @@ static int __devinit snd_rme9652_create(struct snd_card *card, | |||
2479 | } | 2479 | } |
2480 | 2480 | ||
2481 | if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED, | 2481 | if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED, |
2482 | "rme9652", rme9652)) { | 2482 | KBUILD_MODNAME, rme9652)) { |
2483 | snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq); | 2483 | snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq); |
2484 | return -EBUSY; | 2484 | return -EBUSY; |
2485 | } | 2485 | } |
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 02654dc1d382..bcf61524a13f 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -1235,7 +1235,7 @@ static int sis_resume(struct pci_dev *pci) | |||
1235 | } | 1235 | } |
1236 | 1236 | ||
1237 | if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, | 1237 | if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, |
1238 | card->shortname, sis)) { | 1238 | KBUILD_MODNAME, sis)) { |
1239 | printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq); | 1239 | printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq); |
1240 | goto error; | 1240 | goto error; |
1241 | } | 1241 | } |
@@ -1341,7 +1341,7 @@ static int __devinit sis_chip_create(struct snd_card *card, | |||
1341 | goto error_out_cleanup; | 1341 | goto error_out_cleanup; |
1342 | 1342 | ||
1343 | if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, | 1343 | if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, |
1344 | card->shortname, sis)) { | 1344 | KBUILD_MODNAME, sis)) { |
1345 | printk(KERN_ERR "unable to allocate irq %d\n", sis->irq); | 1345 | printk(KERN_ERR "unable to allocate irq %d\n", sis->irq); |
1346 | goto error_out_cleanup; | 1346 | goto error_out_cleanup; |
1347 | } | 1347 | } |
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 860903e10f0f..2571a67b389a 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -1294,7 +1294,7 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card, | |||
1294 | sonic->game_port = pci_resource_start(pci, 4); | 1294 | sonic->game_port = pci_resource_start(pci, 4); |
1295 | 1295 | ||
1296 | if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED, | 1296 | if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED, |
1297 | "S3 SonicVibes", sonic)) { | 1297 | KBUILD_MODNAME, sonic)) { |
1298 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1298 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1299 | snd_sonicvibes_free(sonic); | 1299 | snd_sonicvibes_free(sonic); |
1300 | return -EBUSY; | 1300 | return -EBUSY; |
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index 2870a4fdc130..5bd57a7c52d2 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
@@ -3598,7 +3598,7 @@ int __devinit snd_trident_create(struct snd_card *card, | |||
3598 | trident->port = pci_resource_start(pci, 0); | 3598 | trident->port = pci_resource_start(pci, 0); |
3599 | 3599 | ||
3600 | if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED, | 3600 | if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED, |
3601 | "Trident Audio", trident)) { | 3601 | KBUILD_MODNAME, trident)) { |
3602 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 3602 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
3603 | snd_trident_free(trident); | 3603 | snd_trident_free(trident); |
3604 | return -EBUSY; | 3604 | return -EBUSY; |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index d0e19c0c4f0a..f03fd620a2a0 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -2377,7 +2377,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card, | |||
2377 | chip_type == TYPE_VIA8233 ? | 2377 | chip_type == TYPE_VIA8233 ? |
2378 | snd_via8233_interrupt : snd_via686_interrupt, | 2378 | snd_via8233_interrupt : snd_via686_interrupt, |
2379 | IRQF_SHARED, | 2379 | IRQF_SHARED, |
2380 | card->driver, chip)) { | 2380 | KBUILD_MODNAME, chip)) { |
2381 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2381 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2382 | snd_via82xx_free(chip); | 2382 | snd_via82xx_free(chip); |
2383 | return -EBUSY; | 2383 | return -EBUSY; |
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index c55401acf6b2..a386dd9f6732 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
@@ -1129,7 +1129,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card, | |||
1129 | } | 1129 | } |
1130 | chip->port = pci_resource_start(pci, 0); | 1130 | chip->port = pci_resource_start(pci, 0); |
1131 | if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED, | 1131 | if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED, |
1132 | card->driver, chip)) { | 1132 | KBUILD_MODNAME, chip)) { |
1133 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1133 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1134 | snd_via82xx_free(chip); | 1134 | snd_via82xx_free(chip); |
1135 | return -EBUSY; | 1135 | return -EBUSY; |
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index 371d9d399d25..5342d5e1366a 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c | |||
@@ -169,7 +169,7 @@ static int __devinit snd_vx222_create(struct snd_card *card, struct pci_dev *pci | |||
169 | vx->port[i] = pci_resource_start(pci, i + 1); | 169 | vx->port[i] = pci_resource_start(pci, i + 1); |
170 | 170 | ||
171 | if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED, | 171 | if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED, |
172 | CARD_NAME, chip)) { | 172 | KBUILD_MODNAME, chip)) { |
173 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 173 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
174 | snd_vx222_free(chip); | 174 | snd_vx222_free(chip); |
175 | return -EBUSY; | 175 | return -EBUSY; |
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index c94c051ad0c8..f3260e658b8a 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -2380,7 +2380,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card, | |||
2380 | return -EBUSY; | 2380 | return -EBUSY; |
2381 | } | 2381 | } |
2382 | if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED, | 2382 | if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED, |
2383 | "YMFPCI", chip)) { | 2383 | KBUILD_MODNAME, chip)) { |
2384 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2384 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2385 | snd_ymfpci_free(chip); | 2385 | snd_ymfpci_free(chip); |
2386 | return -EBUSY; | 2386 | return -EBUSY; |