ALSA: Use KBUILD_MODNAME for pci_driver.name entries

The convention for pci_driver.name entry in kernel drivers seem to be
the module name or equivalent ones.  But, so far, almost all PCI sound
drivers use more verbose name like "ABC Xyz (12)", and these are fairly
confusing when appearing as a file name.

This patch converts the all pci_driver.name entries in sound/pci/* to
use KBUILD_MODNAME for more unified appearance.

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

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index d8f6fd65ebbb323cc2bb039ddda49c581807c941..fe617ee93214397d0affdc745eb9ee88c078f6d3 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -1055,7 +1055,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = {
 MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
 
 static struct pci_driver ad1889_pci_driver = {
-       .name = "AD1889 Audio",
+       .name = KBUILD_MODNAME,
        .id_table = snd_ad1889_ids,
        .probe = snd_ad1889_probe,
        .remove = __devexit_p(snd_ad1889_remove),

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 5c6e322a48f0dfd0d3f23e78c4148be40455240a..2def167d7df63bda3f84f304aed4415db4fb0708 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2295,7 +2295,7 @@ static void __devexit snd_ali_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "ALI 5451",
+       .name = KBUILD_MODNAME,
        .id_table = snd_ali_ids,
        .probe = snd_ali_probe,
        .remove = __devexit_p(snd_ali_remove),

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index d7653cb7ac60dc24f5d3e07ff1537f18a32e1299..0958daccd15e6f1dbf0699ef5b45dfafcabf7c32 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -846,7 +846,7 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver driver = {
-       .name = "ALS300",
+       .name = KBUILD_MODNAME,
        .id_table = snd_als300_ids,
        .probe = snd_als300_probe,
        .remove = __devexit_p(snd_als300_remove),

diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 0e247cb90eccb84effeaf54397fd87fc80a9630e..a9c1af33f276623931f826b91971a1a6a5937152 100644 (file)
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -1036,7 +1036,7 @@ static int snd_als4000_resume(struct pci_dev *pci)
 
 
 static struct pci_driver driver = {
-       .name = "ALS4000",
+       .name = KBUILD_MODNAME,
        .id_table = snd_als4000_ids,
        .probe = snd_card_als4000_probe,
        .remove = __devexit_p(snd_card_als4000_remove),

diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 2ca6f4f85b412a18502ac0f6370d19cc604d7d56..ddf882ed1dfb51f91a17c99f445aa0b1d68d4432 100644 (file)
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -2924,7 +2924,7 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {
 MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
 
 static struct pci_driver driver = {
-       .name = "asihpi",
+       .name = KBUILD_MODNAME,
        .id_table = asihpi_pci_tbl,
        .probe = snd_asihpi_probe,
        .remove = __devexit_p(snd_asihpi_remove),

diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 3119cd97a217e748a48cce8b211a964354de3fed..550b574b4734b8f2a02abf9539ae2bd865b25ccd 100644 (file)
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1701,7 +1701,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "ATI IXP AC97 controller",
+       .name = KBUILD_MODNAME,
        .id_table = snd_atiixp_ids,
        .probe = snd_atiixp_probe,
        .remove = __devexit_p(snd_atiixp_remove),

diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 2f74c2fdf1ea573fd2a596ed7f1005980942c3cb..2fef550bef94f223c657a885f09959de741061a7 100644 (file)
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1332,7 +1332,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "ATI IXP MC97 controller",
+       .name = KBUILD_MODNAME,
        .id_table = snd_atiixp_ids,
        .probe = snd_atiixp_probe,
        .remove = __devexit_p(snd_atiixp_remove),

diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 7b72c88e449d24748ac043bb650a69b91f3dafa7..4933e4e9ac872dbf317e596d0023d76818c60b00 100644 (file)
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -375,7 +375,7 @@ static void __devexit snd_vortex_remove(struct pci_dev *pci)
 
 // pci_driver definition
 static struct pci_driver driver = {
-       .name = CARD_NAME_SHORT,
+       .name = KBUILD_MODNAME,
        .id_table = snd_vortex_ids,
        .probe = snd_vortex_probe,
        .remove = __devexit_p(snd_vortex_remove),

diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index c15002242d98863f945fc026e6c3feb49768aace..8410edb5fbaf804938a27952ff08467021939768 100644 (file)
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -171,7 +171,7 @@ MODULE_DEVICE_TABLE(pci, snd_aw2_ids);
 
 /* pci_driver definition */
 static struct pci_driver driver = {
-       .name = "Emagic Audiowerk 2",
+       .name = KBUILD_MODNAME,
        .id_table = snd_aw2_ids,
        .probe = snd_aw2_probe,
        .remove = __devexit_p(snd_aw2_remove),

diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 9b7a6346037ac70c18b4bd1e2112498f51763d80..71d3525719fc85be80d75d465b7d8f38c5528a23 100644 (file)
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2860,7 +2860,7 @@ snd_azf3328_resume(struct pci_dev *pci)
 
 
 static struct pci_driver driver = {
-       .name = "AZF3328",
+       .name = KBUILD_MODNAME,
        .id_table = snd_azf3328_ids,
        .probe = snd_azf3328_probe,
        .remove = __devexit_p(snd_azf3328_remove),

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 2958a05b5293f240fa6da19de314d8bc6e728f4c..89428099d811569ce30a3e68d1a8f4394b684868 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -965,7 +965,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
 };
 
 static struct pci_driver driver = {
-       .name = "Bt87x",
+       .name = KBUILD_MODNAME,
        .id_table = snd_bt87x_ids,
        .probe = snd_bt87x_probe,
        .remove = __devexit_p(snd_bt87x_remove),

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 437759239694b00708919acba5c39be26be3c19c..62078750933951016abf3950dc53af784ad35c53 100644 (file)
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1933,7 +1933,7 @@ MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
 
 // pci_driver definition
 static struct pci_driver driver = {
-       .name = "CA0106",
+       .name = KBUILD_MODNAME,
        .id_table = snd_ca0106_ids,
        .probe = snd_ca0106_probe,
        .remove = __devexit_p(snd_ca0106_remove),

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index f4e573555da346822f630cdd1f032bf0853c4cfb..84af5bece127f22994ad448ccf3c06c29fa2ea6f 100644 (file)
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -3398,7 +3398,7 @@ static int snd_cmipci_resume(struct pci_dev *pci)
 #endif /* CONFIG_PM */
 
 static struct pci_driver driver = {
-       .name = "C-Media PCI",
+       .name = KBUILD_MODNAME,
        .id_table = snd_cmipci_ids,
        .probe = snd_cmipci_probe,
        .remove = __devexit_p(snd_cmipci_remove),

diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 6772070ed49254e01ed1b2996a8f4fefe446dcf5..67052d9069cf86d19cefa696d1a37dc2d412381e 100644 (file)
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -2085,7 +2085,7 @@ static int cs4281_resume(struct pci_dev *pci)
 #endif /* CONFIG_PM */
 
 static struct pci_driver driver = {
-       .name = "CS4281",
+       .name = KBUILD_MODNAME,
        .id_table = snd_cs4281_ids,
        .probe = snd_cs4281_probe,
        .remove = __devexit_p(snd_cs4281_remove),

diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index 767fa7f06cd0857e3ca2cf22ec333fbc683e0215..1af95559aaaa56fef9dac61e0369a0514c545599 100644 (file)
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -162,7 +162,7 @@ static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Sound Fusion CS46xx",
+       .name = KBUILD_MODNAME,
        .id_table = snd_cs46xx_ids,
        .probe = snd_card_cs46xx_probe,
        .remove = __devexit_p(snd_card_cs46xx_remove),

diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index bc07e275d4d4237879f03cbb80eaa78ff233b087..a4669346d14651efff06b4875718b5967b7f8e17 100644 (file)
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -285,7 +285,7 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver driver = {
-       .name = "CS5530_Audio",
+       .name = KBUILD_MODNAME,
        .id_table = snd_cs5530_ids,
        .probe = snd_cs5530_probe,
        .remove = __devexit_p(snd_cs5530_remove),

diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index afb803708416e4dec1b0e7182f288b34243797f4..a6a877747e713cd83e291eb25940fdab15983340 100644 (file)
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -395,7 +395,7 @@ static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = DRIVER_NAME,
+       .name = KBUILD_MODNAME,
        .id_table = snd_cs5535audio_ids,
        .probe = snd_cs5535audio_probe,
        .remove = __devexit_p(snd_cs5535audio_remove),

diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index f42e7e1a107457bf99091d5813b438a88fe31f2f..d20ddfee2c1f3f5c1be3d37f574033e91ca2414e 100644 (file)
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -143,7 +143,7 @@ static int ct_card_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver ct_driver = {
-       .name = "SB-XFi",
+       .name = KBUILD_MODNAME,
        .id_table = ct_pci_dev_ids,
        .probe = ct_card_probe,
        .remove = __devexit_p(ct_card_remove),

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 20763dd03fa010f41e6bcd236cb296df02ca8b3b..d302e0f3959635c4dcffc0521f5f9852d97923eb 100644 (file)
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2327,7 +2327,7 @@ static void __devexit snd_echo_remove(struct pci_dev *pci)
 
 /* pci_driver definition */
 static struct pci_driver driver = {
-       .name = "Echoaudio " ECHOCARD_NAME,
+       .name = KBUILD_MODNAME,
        .id_table = snd_echo_ids,
        .probe = snd_echo_probe,
        .remove = __devexit_p(snd_echo_remove),

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index aff8387c45cf2e2955d71ee0ca3446808402feaa..a9c45d2cdb13706a150210b6f7b7c9a89e81f7ee 100644 (file)
--- 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)
 #endif
 
 static struct pci_driver driver = {
-       .name = "EMU10K1_Audigy",
+       .name = KBUILD_MODNAME,
        .id_table = snd_emu10k1_ids,
        .probe = snd_card_emu10k1_probe,
        .remove = __devexit_p(snd_card_emu10k1_remove),

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 0c701e4ec8a58223d71d985bd0fd593d0acb2c5e..c9cb73105525d6145fdbafe4c48e5479aaf01948 100644 (file)
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1613,7 +1613,7 @@ MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
 
 // pci_driver definition
 static struct pci_driver driver = {
-       .name = "EMU10K1X",
+       .name = KBUILD_MODNAME,
        .id_table = snd_emu10k1x_ids,
        .probe = snd_emu10k1x_probe,
        .remove = __devexit_p(snd_emu10k1x_remove),

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 863eafea691f24cc2efe984292f509851f1e8491..a61dd4229773d2d66396450d36048e48b3b40246 100644 (file)
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2489,7 +2489,7 @@ static void __devexit snd_audiopci_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = DRIVER_NAME,
+       .name = KBUILD_MODNAME,
        .id_table = snd_audiopci_ids,
        .probe = snd_audiopci_probe,
        .remove = __devexit_p(snd_audiopci_remove),

diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 553b752172593fc377d5da54d5267f47ece5ed3f..84141d16e701f897989aa84a934c5fee9f70098c 100644 (file)
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1882,7 +1882,7 @@ static void __devexit snd_es1938_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "ESS ES1938 (Solo-1)",
+       .name = KBUILD_MODNAME,
        .id_table = snd_es1938_ids,
        .probe = snd_es1938_probe,
        .remove = __devexit_p(snd_es1938_remove),

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index ab0a6156a704b4c01dc339c06f09f4637367943c..14a2e163fa8cb6e1d80179a36e44f32aa9c627a6 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2925,7 +2925,7 @@ static void __devexit snd_es1968_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "ES1968 (ESS Maestro)",
+       .name = KBUILD_MODNAME,
        .id_table = snd_es1968_ids,
        .probe = snd_es1968_probe,
        .remove = __devexit_p(snd_es1968_remove),

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index a7ec7030cf87e9773a1ce1f58ee318ace075498a..db3963c4bf880b5406d072cf49ac645c4129b161 100644 (file)
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1394,7 +1394,7 @@ static int snd_fm801_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver driver = {
-       .name = "FM801",
+       .name = KBUILD_MODNAME,
        .id_table = snd_fm801_ids,
        .probe = snd_card_fm801_probe,
        .remove = __devexit_p(snd_card_fm801_remove),

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 486f6deb3eee952ab810750ecee652c23acc2b11..29f1d36d6cb031447ae5e253a50fd01f7b7f15e7 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2908,7 +2908,7 @@ MODULE_DEVICE_TABLE(pci, azx_ids);
 
 /* pci_driver definition */
 static struct pci_driver driver = {
-       .name = "HDA Intel",
+       .name = KBUILD_MODNAME,
        .id_table = azx_ids,
        .probe = azx_probe,
        .remove = __devexit_p(azx_remove),

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index f4594d76b6ea216a9065a1694189e9838c023e9f..7410df93769cea9c9390aa544da8b1737f16b09c 100644 (file)
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2802,7 +2802,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "ICE1712",
+       .name = KBUILD_MODNAME,
        .id_table = snd_ice1712_ids,
        .probe = snd_ice1712_probe,
        .remove = __devexit_p(snd_ice1712_remove),

diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index c1498fa5545fe9c52814d152e90e19b3bb95543d..5e7db8dab1a2bb81866b43306f1f2030300808b7 100644 (file)
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2802,7 +2802,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver driver = {
-       .name = "ICE1724",
+       .name = KBUILD_MODNAME,
        .id_table = snd_vt1724_ids,
        .probe = snd_vt1724_probe,
        .remove = __devexit_p(snd_vt1724_remove),

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 6c896dbfd796b39a65596783f036f245078f45c4..c01a89b78d4366e212de22da2852a9e73eaf0eab 100644 (file)
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -3266,7 +3266,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Intel ICH",
+       .name = KBUILD_MODNAME,
        .id_table = snd_intel8x0_ids,
        .probe = snd_intel8x0_probe,
        .remove = __devexit_p(snd_intel8x0_remove),

diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index f3353b49c78539fb5deb60830a3cd915f1639799..5eed9ebb446b8a75cae7468093dda8ae9f9c3c29 100644 (file)
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1325,7 +1325,7 @@ static void __devexit snd_intel8x0m_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Intel ICH Modem",
+       .name = KBUILD_MODNAME,
        .id_table = snd_intel8x0m_ids,
        .probe = snd_intel8x0m_probe,
        .remove = __devexit_p(snd_intel8x0m_remove),

diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 6d795700be79123c131698f9f2b750c830e582f9..544a6cdfa2d506cc6bf8c0e88733a5bf4a344fe3 100644 (file)
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2477,7 +2477,7 @@ static void __devexit snd_korg1212_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "korg1212",
+       .name = KBUILD_MODNAME,
        .id_table = snd_korg1212_ids,
        .probe = snd_korg1212_probe,
        .remove = __devexit_p(snd_korg1212_remove),

diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 34b24286d279d542e3d24e80a3531e8cf95bc8f5..77c5e86754194f0ad4c743e4b7109d732c966366 100644 (file)
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -771,7 +771,7 @@ MODULE_DEVICE_TABLE(pci, lola_ids);
 
 /* pci_driver definition */
 static struct pci_driver driver = {
-       .name = DRVNAME,
+       .name = KBUILD_MODNAME,
        .id_table = lola_ids,
        .probe = lola_probe,
        .remove = __devexit_p(lola_remove),

diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index 1bd7a540fd49dfa64918e4d533a3d80cbb8fb4af..b0bd3c53e876da5c274ddc4d54b5d89658329c56 100644 (file)
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -1137,7 +1137,7 @@ static void __devexit snd_lx6464es_remove(struct pci_dev *pci)
 
 
 static struct pci_driver driver = {
-       .name =     "Digigram LX6464ES",
+       .name =     KBUILD_MODNAME,
        .id_table = snd_lx6464es_ids,
        .probe =    snd_lx6464es_probe,
        .remove = __devexit_p(snd_lx6464es_remove),

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 3c40d726b46eacf088335fa007d9ff6c0cf91bd5..0499bf8716d028a85913c663840ea138099ed00e 100644 (file)
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2885,7 +2885,7 @@ static void __devexit snd_m3_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Maestro3",
+       .name = KBUILD_MODNAME,
        .id_table = snd_m3_ids,
        .probe = snd_m3_probe,
        .remove = __devexit_p(snd_m3_remove),

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 6c3fd4d1c49d050c1461554c8cd12b262cc55f7e..9d87e44abd6c0327e40fcbef451b7d323a65a2bd 100644 (file)
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1381,7 +1381,7 @@ static void __devexit snd_mixart_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Digigram miXart",
+       .name = KBUILD_MODNAME,
        .id_table = snd_mixart_ids,
        .probe = snd_mixart_probe,
        .remove = __devexit_p(snd_mixart_remove),

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 5a60492ac7b35f449ceacccecec45b65457d22a6..fd19b7f936ba9eb08e452e56867ee362c7414e3f 100644 (file)
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -1743,7 +1743,7 @@ static void __devexit snd_nm256_remove(struct pci_dev *pci)
 
 
 static struct pci_driver driver = {
-       .name = "NeoMagic 256",
+       .name = KBUILD_MODNAME,
        .id_table = snd_nm256_ids,
        .probe = snd_nm256_probe,
        .remove = __devexit_p(snd_nm256_remove),

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index d7e8ddd9a67b3a28c0d22dbc9876c37b9ea2ecee..218d9854e5cb0718c8bffd042491a531273cc1d3 100644 (file)
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -859,7 +859,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver oxygen_driver = {
-       .name = "CMI8788",
+       .name = KBUILD_MODNAME,
        .id_table = oxygen_ids,
        .probe = generic_oxygen_probe,
        .remove = __devexit_p(oxygen_pci_remove),

diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 469010a8b8497abcf615e88994683d6f69e6d46e..773db794b43f368eb1376e32799ebd26e5564dd6 100644 (file)
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -88,7 +88,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver xonar_driver = {
-       .name = "AV200",
+       .name = KBUILD_MODNAME,
        .id_table = xonar_ids,
        .probe = xonar_probe,
        .remove = __devexit_p(oxygen_pci_remove),

diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 95cfde27d25c6da928c5f02dc211e4231fd840cb..cb215a01ebb63171673e94823dde4c0310a216cd 100644 (file)
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1608,7 +1608,7 @@ static void __devexit pcxhr_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Digigram pcxhr",
+       .name = KBUILD_MODNAME,
        .id_table = pcxhr_ids,
        .probe = pcxhr_probe,
        .remove = __devexit_p(pcxhr_remove),

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index ad5202efd7a9e270523cc517e487c6e1997027e3..91c0cb69d306c8395a8e82c0f1403cb65dae2f2f 100644 (file)
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -2176,7 +2176,7 @@ static void __devexit snd_card_riptide_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "RIPTIDE",
+       .name = KBUILD_MODNAME,
        .id_table = snd_riptide_ids,
        .probe = snd_card_riptide_probe,
        .remove = __devexit_p(snd_card_riptide_remove),
@@ -2188,7 +2188,7 @@ static struct pci_driver driver = {
 
 #ifdef SUPPORT_JOYSTICK
 static struct pci_driver joystick_driver = {
-       .name = "Riptide Joystick",
+       .name = KBUILD_MODNAME "-joystick",
        .id_table = snd_riptide_joystick_ids,
        .probe = snd_riptide_joystick_probe,
        .remove = __devexit_p(snd_riptide_joystick_remove),

diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 3c04524de37c06afbc341809a67e14659edfa975..c7bcc63097f4a512ed4e098e9563acaed08b0fd9 100644 (file)
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1985,7 +1985,7 @@ static void __devexit snd_rme32_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name =         "RME Digi32",
+       .name =         KBUILD_MODNAME,
        .id_table =     snd_rme32_ids,
        .probe =        snd_rme32_probe,
        .remove =       __devexit_p(snd_rme32_remove),

diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 9ff247fc887104644d0ac8d34ae68a0086961014..a3646118abb08b607283c6aaa4929f30802ad3d2 100644 (file)
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -2396,7 +2396,7 @@ static void __devexit snd_rme96_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "RME Digi96",
+       .name = KBUILD_MODNAME,
        .id_table = snd_rme96_ids,
        .probe = snd_rme96_probe,
        .remove = __devexit_p(snd_rme96_remove),

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 2d8332416c83e6de70788798caaabcde890c58a6..da50c5562942641b93d4de81c226da893f066fb8 100644 (file)
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -5637,7 +5637,7 @@ static void __devexit snd_hdsp_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name =     "RME Hammerfall DSP",
+       .name =     KBUILD_MODNAME,
        .id_table = snd_hdsp_ids,
        .probe =    snd_hdsp_probe,
        .remove = __devexit_p(snd_hdsp_remove),

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 949691a876d3635798c6000da1b651d13684b1a6..2785f4cef3491fecf0f463c39571c31a9db2fe9e 100644 (file)
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6775,7 +6775,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "RME Hammerfall DSP MADI",
+       .name = KBUILD_MODNAME,
        .id_table = snd_hdspm_ids,
        .probe = snd_hdspm_probe,
        .remove = __devexit_p(snd_hdspm_remove),

diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index c492af5b25f3e43a9530b69e5c6f7fc591ea30be..9646a8422a85d3fb1149affa92df2ea51fb2e55c 100644 (file)
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -2632,7 +2632,7 @@ static void __devexit snd_rme9652_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name     = "RME Digi9652 (Hammerfall)",
+       .name     = KBUILD_MODNAME,
        .id_table = snd_rme9652_ids,
        .probe    = snd_rme9652_probe,
        .remove   = __devexit_p(snd_rme9652_remove),

diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 2b5c7a95ae1fa36cd18366f6c93edcb941ea775d..02654dc1d382c4bf85f12577ff75c36c4e557e61 100644 (file)
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1436,7 +1436,7 @@ static void __devexit snd_sis7019_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver sis7019_driver = {
-       .name = "SiS7019",
+       .name = KBUILD_MODNAME,
        .id_table = snd_sis7019_ids,
        .probe = snd_sis7019_probe,
        .remove = __devexit_p(snd_sis7019_remove),

diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 337b9facadfdb4f1afc9061f857cf78c37c8703c..860903e10f0f9ec51478a0ba898a24c2d50a0dd0 100644 (file)
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1530,7 +1530,7 @@ static void __devexit snd_sonic_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "S3 SonicVibes",
+       .name = KBUILD_MODNAME,
        .id_table = snd_sonic_ids,
        .probe = snd_sonic_probe,
        .remove = __devexit_p(snd_sonic_remove),

diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 6d0581841d7a3536baebd40f7c47ee7b80ecaaff..d8a128f6fc0269e8ecbf4760879547179651b441 100644 (file)
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -172,7 +172,7 @@ static void __devexit snd_trident_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Trident4DWaveAudio",
+       .name = KBUILD_MODNAME,
        .id_table = snd_trident_ids,
        .probe = snd_trident_probe,
        .remove = __devexit_p(snd_trident_remove),

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 8c5f8b5a59f0d82aa0a734eb6e37bf800cc6ef06..d0e19c0c4f0a1edfcde2597b01529128e7239d3e 100644 (file)
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2611,7 +2611,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "VIA 82xx Audio",
+       .name = KBUILD_MODNAME,
        .id_table = snd_via82xx_ids,
        .probe = snd_via82xx_probe,
        .remove = __devexit_p(snd_via82xx_remove),

diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index f7e8bbbe395392bbb4eecd170f75cfa5a3bd68c9..c55401acf6b25760f2d6d5daf427472e1c2dc529 100644 (file)
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -1224,7 +1224,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "VIA 82xx Modem",
+       .name = KBUILD_MODNAME,
        .id_table = snd_via82xx_modem_ids,
        .probe = snd_via82xx_probe,
        .remove = __devexit_p(snd_via82xx_remove),

diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 99a9a814be0beecbb71d98df7a328652694e7ce2..371d9d399d25884b7f0e5d62f6a51a98c1d13687 100644 (file)
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -290,7 +290,7 @@ static int snd_vx222_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver driver = {
-       .name = "Digigram VX222",
+       .name = KBUILD_MODNAME,
        .id_table = snd_vx222_ids,
        .probe = snd_vx222_probe,
        .remove = __devexit_p(snd_vx222_remove),

diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 80c6821133816978cb91c92e8391e463d7156e48..511d5765312495bb71b8ed2d37cb7cf284a725de 100644 (file)
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -345,7 +345,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
 }
 
 static struct pci_driver driver = {
-       .name = "Yamaha DS-1 PCI",
+       .name = KBUILD_MODNAME,
        .id_table = snd_ymfpci_ids,
        .probe = snd_card_ymfpci_probe,
        .remove = __devexit_p(snd_card_ymfpci_remove),