ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/*

The name argument of request_irq() appears in /proc/interrupts, and
it's quite ugly when the name entry contains a space or special letters.
In general, it's simpler and more readable when the module name appears
there, so let's replace all entries with KBUILD_MODNAME.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index fe617ee93214397d0affdc745eb9ee88c078f6d3..201503673f25a06b9665667d27255ea0cd5087f0 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -944,7 +944,7 @@ snd_ad1889_create(struct snd_card *card,
        spin_lock_init(&chip->lock);    /* only now can we call ad1889_free */
 
        if (request_irq(pci->irq, snd_ad1889_interrupt,
-                       IRQF_SHARED, card->driver, chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
                snd_ad1889_free(chip);
                return -EBUSY;

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 2def167d7df63bda3f84f304aed4415db4fb0708..b444b74d9dcf440e1b0c2a427a407ed0d3df9dcd 100644 (file)
--- 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)
        codec->port = pci_resource_start(codec->pci, 0);
 
        if (request_irq(codec->pci->irq, snd_ali_card_interrupt,
-                       IRQF_SHARED, "ALI 5451", codec)) {
+                       IRQF_SHARED, KBUILD_MODNAME, codec)) {
                snd_printk(KERN_ERR "Unable to request irq.\n");
                return -EBUSY;
        }

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 0958daccd15e6f1dbf0699ef5b45dfafcabf7c32..736c8e93db1f69454d070606fcb04d1395d4179a 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -722,7 +722,7 @@ static int __devinit snd_als300_create(struct snd_card *card,
                irq_handler = snd_als300_interrupt;
 
        if (request_irq(pci->irq, irq_handler, IRQF_SHARED,
-                       card->shortname, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_als300_free(chip);
                return -EBUSY;

diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 550b574b4734b8f2a02abf9539ae2bd865b25ccd..537e0a2cc68a99ed5bb8c7c6da7eae6e046b33cb 100644 (file)
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1624,7 +1624,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
        }
 
        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
-                       card->shortname, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_atiixp_free(chip);
                return -EBUSY;

diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 2fef550bef94f223c657a885f09959de741061a7..45df275c8248e25c8790061bcfea3afb5f7d8e5f 100644 (file)
--- 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,
        }
 
        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
-                       card->shortname, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_atiixp_free(chip);
                return -EBUSY;

diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 4933e4e9ac872dbf317e596d0023d76818c60b00..a38469986885e0bd1bbfd248738463445fe783cb 100644 (file)
--- 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)
        }
 
        if ((err = request_irq(pci->irq, vortex_interrupt,
-                              IRQF_SHARED, CARD_NAME_SHORT,
+                              IRQF_SHARED, KBUILD_MODNAME,
                               chip)) != 0) {
                printk(KERN_ERR "cannot grab irq\n");
                goto irq_out;

diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 8410edb5fbaf804938a27952ff08467021939768..f8569b11331be0a07f497a428d90228808d2599c 100644 (file)
--- 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,
        snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
 
        if (request_irq(pci->irq, snd_aw2_saa7146_interrupt,
-                       IRQF_SHARED, "Audiowerk2", chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci->irq);
 
                iounmap(chip->iobase_virt);

diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 71d3525719fc85be80d75d465b7d8f38c5528a23..e4d76a270c9f13cf137fb68a78898d4d961200c5 100644 (file)
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2559,7 +2559,7 @@ snd_azf3328_create(struct snd_card *card,
        codec_setup->name = "I2S_OUT";
 
        if (request_irq(pci->irq, snd_azf3328_interrupt,
-                       IRQF_SHARED, card->shortname, chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                err = -EBUSY;
                goto out_err;

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 89428099d811569ce30a3e68d1a8f4394b684868..39180335c23774337e79e07e16d974bd10e7810b 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -760,7 +760,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
        snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
 
        err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
-                         "Bt87x audio", chip);
+                         KBUILD_MODNAME, chip);
        if (err < 0) {
                snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
                goto fail;

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 62078750933951016abf3950dc53af784ad35c53..061b7e6545866e64c5384da0df44a3644db6b064 100644 (file)
--- 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,
        }
 
        if (request_irq(pci->irq, snd_ca0106_interrupt,
-                       IRQF_SHARED, "snd_ca0106", chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                snd_ca0106_free(chip);
                printk(KERN_ERR "cannot grab irq\n");
                return -EBUSY;

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 84af5bece127f22994ad448ccf3c06c29fa2ea6f..9cf99fb7eb9c5b872ab100615f24ff7ca4ce1c72 100644 (file)
--- 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
        cm->iobase = pci_resource_start(pci, 0);
 
        if (request_irq(pci->irq, snd_cmipci_interrupt,
-                       IRQF_SHARED, card->driver, cm)) {
+                       IRQF_SHARED, KBUILD_MODNAME, cm)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_cmipci_free(cm);
                return -EBUSY;

diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 67052d9069cf86d19cefa696d1a37dc2d412381e..07f04e390aa15697a114203d901a064d1e706327 100644 (file)
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1382,7 +1382,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
        }
        
        if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED,
-                       "CS4281", chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_cs4281_free(chip);
                return -ENOMEM;

diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index aad37082cb6ee67c4d371a1bfa51faf6db89fe42..9546bf07f0d130a73d52b8a9778fe8cd44902d8c 100644 (file)
--- 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,
        }
 
        if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_SHARED,
-                       "CS46XX", chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_cs46xx_free(chip);
                return -EBUSY;

diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index a6a877747e713cd83e291eb25940fdab15983340..10d22ed5fece89e2dd6982484833db3c0dd5efcc 100644 (file)
--- 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,
        cs5535au->port = pci_resource_start(pci, 0);
 
        if (request_irq(pci->irq, snd_cs5535audio_interrupt,
-                       IRQF_SHARED, "CS5535 Audio", cs5535au)) {
+                       IRQF_SHARED, KBUILD_MODNAME, cs5535au)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                err = -EBUSY;
                goto sndfail;

diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index a5c957db5cea2fc297c283f3ee339dc960204bf9..284baf9660eb63e5cb11233a8e796655234f8218 100644 (file)
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1933,7 +1933,7 @@ static int hw_card_start(struct hw *hw)
 
        if (hw->irq < 0) {
                err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED,
-                                 "ctxfi", hw);
+                                 KBUILD_MODNAME, hw);
                if (err < 0) {
                        printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
                        goto error2;

diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 5364164674e4cce9e39f56542182e150c582659d..64f9ded85bbbefc259372ccd785ff72716135648 100644 (file)
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -1925,7 +1925,7 @@ static int hw_card_start(struct hw *hw)
 
        if (hw->irq < 0) {
                err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
-                                 "ctxfi", hw);
+                                 KBUILD_MODNAME, hw);
                if (err < 0) {
                        printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
                        goto error2;

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index d302e0f3959635c4dcffc0521f5f9852d97923eb..d7306980d0f1181053342d450a7e7521ae5a509c 100644 (file)
--- 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,
                ioremap_nocache(chip->dsp_registers_phys, sz);
 
        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
-                       ECHOCARD_NAME, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_echo_free(chip);
                snd_printk(KERN_ERR "cannot grab irq\n");
                return -EBUSY;
@@ -2286,7 +2286,7 @@ static int snd_echo_resume(struct pci_dev *pci)
        kfree(commpage_bak);
 
        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
-                       ECHOCARD_NAME, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_echo_free(chip);
                snd_printk(KERN_ERR "cannot grab irq\n");
                return -EBUSY;

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 5e619a84da061295fa4758e313935e89aea8009d..8733790af90a594d21ee6a0dee1544eb87655b43 100644 (file)
--- 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,
 
        /* irq handler must be registered after I/O ports are activated */
        if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
-                       "EMU10K1", emu)) {
+                       KBUILD_MODNAME, emu)) {
                err = -EBUSY;
                goto error;
        }

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index c9cb73105525d6145fdbafe4c48e5479aaf01948..d4fde1b4b093af92c11a798e34b53708cb52fe36 100644 (file)
--- 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,
        }
 
        if (request_irq(pci->irq, snd_emu10k1x_interrupt,
-                       IRQF_SHARED, "EMU10K1X", chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
                snd_emu10k1x_free(chip);
                return -EBUSY;

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index a61dd4229773d2d66396450d36048e48b3b40246..f02e2f8d712270782db072da7fa8201a230e8441 100644 (file)
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2120,7 +2120,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
        }
        ensoniq->port = pci_resource_start(pci, 0);
        if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
-                       "Ensoniq AudioPCI", ensoniq)) {
+                       KBUILD_MODNAME, ensoniq)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_ensoniq_free(ensoniq);
                return -EBUSY;

diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 84141d16e701f897989aa84a934c5fee9f70098c..26a5a2f25d4bc890a6ff42c96580edfd4b5b70ec 100644 (file)
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1514,7 +1514,7 @@ static int es1938_resume(struct pci_dev *pci)
        }
 
        if (request_irq(pci->irq, snd_es1938_interrupt,
-                       IRQF_SHARED, "ES1938", chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                printk(KERN_ERR "es1938: unable to grab IRQ %d, "
                       "disabling device\n", pci->irq);
                snd_card_disconnect(card);
@@ -1636,7 +1636,7 @@ static int __devinit snd_es1938_create(struct snd_card *card,
        chip->mpu_port = pci_resource_start(pci, 3);
        chip->game_port = pci_resource_start(pci, 4);
        if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED,
-                       "ES1938", chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_es1938_free(chip);
                return -EBUSY;

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 14a2e163fa8cb6e1d80179a36e44f32aa9c627a6..3fa46593a3b94e7ff3639298bf2f184ab121c8e1 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2746,7 +2746,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
        }
        chip->io_port = pci_resource_start(pci, 0);
        if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED,
-                       "ESS Maestro", chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_es1968_free(chip);
                return -EBUSY;

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index db3963c4bf880b5406d072cf49ac645c4129b161..f9123f09e83e7922aa5a518081d8d711d231e9a9 100644 (file)
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1199,7 +1199,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
        chip->port = pci_resource_start(pci, 0);
        if ((tea575x_tuner & TUNER_ONLY) == 0) {
                if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED,
-                               "FM801", chip)) {
+                               KBUILD_MODNAME, chip)) {
                        snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
                        snd_fm801_free(chip);
                        return -EBUSY;

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 29f1d36d6cb031447ae5e253a50fd01f7b7f15e7..5cc3d07f715f8d583610a01f487e125a9026cb95 100644 (file)
--- 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)
 {
        if (request_irq(chip->pci->irq, azx_interrupt,
                        chip->msi ? 0 : IRQF_SHARED,
-                       "hda_intel", chip)) {
+                       KBUILD_MODNAME, chip)) {
                printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
                       "disabling device\n", chip->pci->irq);
                if (do_disconnect)

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 7410df93769cea9c9390aa544da8b1737f16b09c..be06fb3e45a1e90d2fd4c3dcdeb5babc605bfdfe 100644 (file)
--- 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,
        ice->profi_port = pci_resource_start(pci, 3);
 
        if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED,
-                       "ICE1712", ice)) {
+                       KBUILD_MODNAME, ice)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_ice1712_free(ice);
                return -EIO;

diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 5e7db8dab1a2bb81866b43306f1f2030300808b7..c2b7f8bc41e4bc1c4a0586ad173cdd3607dcca42 100644 (file)
--- 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,
        ice->profi_port = pci_resource_start(pci, 1);
 
        if (request_irq(pci->irq, snd_vt1724_interrupt,
-                       IRQF_SHARED, "ICE1724", ice)) {
+                       IRQF_SHARED, KBUILD_MODNAME, ice)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_vt1724_free(ice);
                return -EIO;

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index c01a89b78d4366e212de22da2852a9e73eaf0eab..f9acf0f03da285a06fa293bb213c076e34dbaa6d 100644 (file)
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2647,7 +2647,7 @@ static int intel8x0_resume(struct pci_dev *pci)
        pci_set_master(pci);
        snd_intel8x0_chip_init(chip, 0);
        if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                       IRQF_SHARED, card->shortname, chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
                       "disabling device\n", pci->irq);
                snd_card_disconnect(card);
@@ -3106,7 +3106,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
 
        /* request irq after initializaing int_sta_mask, etc */
        if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                       IRQF_SHARED, card->shortname, chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_intel8x0_free(chip);
                return -EBUSY;

diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 5eed9ebb446b8a75cae7468093dda8ae9f9c3c29..7c161645d86567e412635f3f09ab3f11dd371fdb 100644 (file)
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1047,7 +1047,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
        }
        pci_set_master(pci);
        if (request_irq(pci->irq, snd_intel8x0m_interrupt,
-                       IRQF_SHARED, card->shortname, chip)) {
+                       IRQF_SHARED, KBUILD_MODNAME, chip)) {
                printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "
                       "disabling device\n", pci->irq);
                snd_card_disconnect(card);
@@ -1174,7 +1174,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
 
  port_inited:
        if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED,
-                       card->shortname, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_intel8x0m_free(chip);
                return -EBUSY;

diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 544a6cdfa2d506cc6bf8c0e88733a5bf4a344fe3..fc1d573cf3063ef13fa92172f7a031f7b927b29c 100644 (file)
--- 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 *
 
         err = request_irq(pci->irq, snd_korg1212_interrupt,
                           IRQF_SHARED,
-                          "korg1212", korg1212);
+                          KBUILD_MODNAME, korg1212);
 
         if (err) {
                snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci->irq);

diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 77c5e86754194f0ad4c743e4b7109d732c966366..1dc6f5b1d66897c92a6415bec90ccc9c66605441 100644 (file)
--- 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,
                goto errout;
 
        if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED,
-                       DRVNAME, chip)) {
+                       KBUILD_MODNAME, chip)) {
                printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq);
                err = -EBUSY;
                goto errout;

diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index b0bd3c53e876da5c274ddc4d54b5d89658329c56..38ae83951de0ce3184ae012bbd667e8f8868225c 100644 (file)
--- 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,
        chip->port_dsp_bar = pci_ioremap_bar(pci, 2);
 
        err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED,
-                         card_name, chip);
+                         KBUILD_MODNAME, chip);
        if (err) {
                snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq);
                goto request_irq_failed;

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 0499bf8716d028a85913c663840ea138099ed00e..64f6f627f4c24a971c8765c5c0f484f9337fff09 100644 (file)
--- 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,
 #endif
 
        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
-                       card->driver, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_m3_free(chip);
                return -ENOMEM;

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 9d87e44abd6c0327e40fcbef451b7d323a65a2bd..dbee59906ae17fdc93debb3541d23d30dff4d4b2 100644 (file)
--- 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,
        }
 
        if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED,
-                       CARD_NAME, mgr)) {
+                       KBUILD_MODNAME, mgr)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_mixart_free(mgr);
                return -EBUSY;

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index fd19b7f936ba9eb08e452e56867ee362c7414e3f..83ea7a7d3eec728be5c159c6e3fcdcad3bb1283a 100644 (file)
--- 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)
        mutex_lock(&chip->irq_mutex);
        if (chip->irq < 0) {
                if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED,
-                               chip->card->driver, chip)) {
+                               KBUILD_MODNAME, chip)) {
                        snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
                        mutex_unlock(&chip->irq_mutex);
                        return -EBUSY;

diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 70b739816fcc46fcde313ef5d6552c39902784ec..82311fcb86f6d37e80e6c03e3c7b2503f5a03bba 100644 (file)
--- 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,
        chip->model.init(chip);
 
        err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
-                         DRIVER, chip);
+                         KBUILD_MODNAME, chip);
        if (err < 0) {
                snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
                goto err_card;

diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index cb215a01ebb63171673e94823dde4c0310a216cd..046578d26f982eab05a1b9e1478433fce60f012d 100644 (file)
--- 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,
        mgr->irq = -1;
 
        if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED,
-                       card_name, mgr)) {
+                       KBUILD_MODNAME, mgr)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                pcxhr_free(mgr);
                return -EBUSY;

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 91c0cb69d306c8395a8e82c0f1403cb65dae2f2f..e34ae14908b312df02b4c5708c924415b09d7cf5 100644 (file)
--- 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,
        UNSET_AIE(hwport);
 
        if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED,
-                       "RIPTIDE", chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
                           pci->irq);
                snd_riptide_free(chip);

diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index c7bcc63097f4a512ed4e098e9563acaed08b0fd9..6be77a264d47e386949cbfe0e1b67cd01f0dc27b 100644 (file)
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1355,7 +1355,7 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
        }
 
        if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED,
-                       "RME32", rme32)) {
+                       KBUILD_MODNAME, rme32)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                return -EBUSY;
        }

diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index a3646118abb08b607283c6aaa4929f30802ad3d2..409e5b89519d0dd0ad9c5304508f6f05495340c0 100644 (file)
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -1561,7 +1561,7 @@ snd_rme96_create(struct rme96 *rme96)
        }
 
        if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED,
-                       "RME96", rme96)) {
+                       KBUILD_MODNAME, rme96)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                return -EBUSY;
        }

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index da50c5562942641b93d4de81c226da893f066fb8..1c6d1e1c27c14992834aaea6c2cb6ccdb5e8d37b 100644 (file)
--- 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,
        }
 
        if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_SHARED,
-                       "hdsp", hdsp)) {
+                       KBUILD_MODNAME, hdsp)) {
                snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq);
                return -EBUSY;
        }

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 2785f4cef3491fecf0f463c39571c31a9db2fe9e..32d0c9c35007ac59544457ddffaa4c7eab4763f0 100644 (file)
--- 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,
                        hdspm->port + io_extent - 1);
 
        if (request_irq(pci->irq, snd_hdspm_interrupt,
-                               IRQF_SHARED, "hdspm", hdspm)) {
+                       IRQF_SHARED, KBUILD_MODNAME, hdspm)) {
                snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
                return -EBUSY;
        }

diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 9646a8422a85d3fb1149affa92df2ea51fb2e55c..1c7bc1ef8186ee27ff7382ff0eb6526f8d2b15b7 100644 (file)
--- 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,
        }
        
        if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED,
-                       "rme9652", rme9652)) {
+                       KBUILD_MODNAME, rme9652)) {
                snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq);
                return -EBUSY;
        }

diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 02654dc1d382c4bf85f12577ff75c36c4e557e61..bcf61524a13f7ae92ee0abdc7a4cd0ac8294dfba 100644 (file)
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1235,7 +1235,7 @@ static int sis_resume(struct pci_dev *pci)
        }
 
        if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED,
-                               card->shortname, sis)) {
+                       KBUILD_MODNAME, sis)) {
                printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq);
                goto error;
        }
@@ -1341,7 +1341,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
                goto error_out_cleanup;
 
        if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED,
-                               card->shortname, sis)) {
+                       KBUILD_MODNAME, sis)) {
                printk(KERN_ERR "unable to allocate irq %d\n", sis->irq);
                goto error_out_cleanup;
        }

diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 860903e10f0f9ec51478a0ba898a24c2d50a0dd0..2571a67b389a1488d83c78ce1d200c343b0aa57a 100644 (file)
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1294,7 +1294,7 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
        sonic->game_port = pci_resource_start(pci, 4);
 
        if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED,
-                       "S3 SonicVibes", sonic)) {
+                       KBUILD_MODNAME, sonic)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_sonicvibes_free(sonic);
                return -EBUSY;

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 2870a4fdc130491671e6454996debcd84c5a38cb..5bd57a7c52d20bb39bd9ff07a96dd400794f4ef7 100644 (file)
--- 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,
        trident->port = pci_resource_start(pci, 0);
 
        if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED,
-                       "Trident Audio", trident)) {
+                       KBUILD_MODNAME, trident)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_trident_free(trident);
                return -EBUSY;

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index d0e19c0c4f0a1edfcde2597b01529128e7239d3e..f03fd620a2a0760b1f028529dd5ad17c654dbc27 100644 (file)
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2377,7 +2377,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
                        chip_type == TYPE_VIA8233 ?
                        snd_via8233_interrupt : snd_via686_interrupt,
                        IRQF_SHARED,
-                       card->driver, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_via82xx_free(chip);
                return -EBUSY;

diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index c55401acf6b25760f2d6d5daf427472e1c2dc529..a386dd9f6732b1d254ec5160623295014e375eaa 100644 (file)
--- 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,
        }
        chip->port = pci_resource_start(pci, 0);
        if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED,
-                       card->driver, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_via82xx_free(chip);
                return -EBUSY;

diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 371d9d399d25884b7f0e5d62f6a51a98c1d13687..5342d5e1366a30970103c209da2a9b1f78a800e9 100644 (file)
--- 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
                vx->port[i] = pci_resource_start(pci, i + 1);
 
        if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED,
-                       CARD_NAME, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_vx222_free(chip);
                return -EBUSY;

diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index c94c051ad0c8576bac2b70f79a12b0442af98f1f..f3260e658b8add161237a6458722d59335792c98 100644 (file)
--- 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,
                return -EBUSY;
        }
        if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED,
-                       "YMFPCI", chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_ymfpci_free(chip);
                return -EBUSY;