diff options
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index aff8387c45c..a9c45d2cdb1 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -264,7 +264,7 @@ static int snd_emu10k1_resume(struct pci_dev *pci) | |||
264 | #endif | 264 | #endif |
265 | 265 | ||
266 | static struct pci_driver driver = { | 266 | static struct pci_driver driver = { |
267 | .name = "EMU10K1_Audigy", | 267 | .name = KBUILD_MODNAME, |
268 | .id_table = snd_emu10k1_ids, | 268 | .id_table = snd_emu10k1_ids, |
269 | .probe = snd_card_emu10k1_probe, | 269 | .probe = snd_card_emu10k1_probe, |
270 | .remove = __devexit_p(snd_card_emu10k1_remove), | 270 | .remove = __devexit_p(snd_card_emu10k1_remove), |
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 15f0161ce4a..fcd4935766b 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -1912,7 +1912,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
1912 | 1912 | ||
1913 | /* irq handler must be registered after I/O ports are activated */ | 1913 | /* irq handler must be registered after I/O ports are activated */ |
1914 | if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, | 1914 | if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, |
1915 | "EMU10K1", emu)) { | 1915 | KBUILD_MODNAME, emu)) { |
1916 | err = -EBUSY; | 1916 | err = -EBUSY; |
1917 | goto error; | 1917 | goto error; |
1918 | } | 1918 | } |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 0c701e4ec8a..d4fde1b4b09 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; |
@@ -1613,7 +1613,7 @@ MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids); | |||
1613 | 1613 | ||
1614 | // pci_driver definition | 1614 | // pci_driver definition |
1615 | static struct pci_driver driver = { | 1615 | static struct pci_driver driver = { |
1616 | .name = "EMU10K1X", | 1616 | .name = KBUILD_MODNAME, |
1617 | .id_table = snd_emu10k1x_ids, | 1617 | .id_table = snd_emu10k1x_ids, |
1618 | .probe = snd_emu10k1x_probe, | 1618 | .probe = snd_emu10k1x_probe, |
1619 | .remove = __devexit_p(snd_emu10k1x_remove), | 1619 | .remove = __devexit_p(snd_emu10k1x_remove), |