openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: pci: clean up using module_pci_driver() 

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-04-24 12:25:00 +02:00
parent 68853fa30c
commit e9f66d9b9c
51 changed files with 98 additions and 705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/pci/ad1889.c
View File

@ -1062,17 +1062,4 @@ static struct pci_driver ad1889_pci_driver = {
.remove = __devexit_p(snd_ad1889_remove),
};
static int __init
alsa_ad1889_init(void)
{
return pci_register_driver(&ad1889_pci_driver);
}
static void __exit
alsa_ad1889_fini(void)
{
pci_unregister_driver(&ad1889_pci_driver);
}
module_init(alsa_ad1889_init);
module_exit(alsa_ad1889_fini);
module_pci_driver(ad1889_pci_driver);

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

@ -2294,7 +2294,7 @@ static void __devexit snd_ali_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver ali5451_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_ali_ids,
.probe = snd_ali_probe,
@ -2305,15 +2305,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_ali_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_ali_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_ali_init)
module_exit(alsa_card_ali_exit)
module_pci_driver(ali5451_driver);

15
sound/pci/als300.c
View File

@ -852,7 +852,7 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
return 0;
}
static struct pci_driver driver = {
static struct pci_driver als300_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_als300_ids,
.probe = snd_als300_probe,
@ -863,15 +863,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_als300_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_als300_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_als300_init)
module_exit(alsa_card_als300_exit)
module_pci_driver(als300_driver);

15
sound/pci/als4000.c
View File

@ -1036,7 +1036,7 @@ static int snd_als4000_resume(struct pci_dev *pci)
#endif /* CONFIG_PM */
static struct pci_driver driver = {
static struct pci_driver als4000_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_als4000_ids,
.probe = snd_card_als4000_probe,
@ -1047,15 +1047,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_als4000_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_als4000_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_als4000_init)
module_exit(alsa_card_als4000_exit)
module_pci_driver(als4000_driver);

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

@ -2963,7 +2963,7 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {
};
MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver asihpi_driver = {
.name = KBUILD_MODNAME,
.id_table = asihpi_pci_tbl,
.probe = snd_asihpi_probe,
@ -2974,19 +2974,4 @@ static struct pci_driver driver = {
#endif
};
static int __init snd_asihpi_init(void)
{
asihpi_init();
return pci_register_driver(&driver);
}
static void __exit snd_asihpi_exit(void)
{
pci_unregister_driver(&driver);
asihpi_exit();
}
module_init(snd_asihpi_init)
module_exit(snd_asihpi_exit)
module_pci_driver(asihpi_driver);

16
sound/pci/atiixp.c
View File

@ -1700,7 +1700,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver atiixp_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe,
@ -1711,16 +1711,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_atiixp_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_atiixp_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_atiixp_init)
module_exit(alsa_card_atiixp_exit)
module_pci_driver(atiixp_driver);

16
sound/pci/atiixp_modem.c
View File

@ -1331,7 +1331,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver atiixp_modem_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe,
@ -1342,16 +1342,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_atiixp_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_atiixp_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_atiixp_init)
module_exit(alsa_card_atiixp_exit)
module_pci_driver(atiixp_modem_driver);

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

@ -375,24 +375,11 @@ static void __devexit snd_vortex_remove(struct pci_dev *pci)
}
// pci_driver definition
static struct pci_driver driver = {
static struct pci_driver vortex_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_vortex_ids,
.probe = snd_vortex_probe,
.remove = __devexit_p(snd_vortex_remove),
};
// initialization of the module
static int __init alsa_card_vortex_init(void)
{
return pci_register_driver(&driver);
}
// clean up the module
static void __exit alsa_card_vortex_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_vortex_init)
module_exit(alsa_card_vortex_exit)
module_pci_driver(vortex_driver);

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

@ -112,8 +112,6 @@ struct aw2 {
/*********************************
* FUNCTION DECLARATIONS
********************************/
static int __init alsa_card_aw2_init(void);
static void __exit alsa_card_aw2_exit(void);
static int snd_aw2_dev_free(struct snd_device *device);
static int __devinit snd_aw2_create(struct snd_card *card,
struct pci_dev *pci, struct aw2 **rchip);
@ -171,13 +169,15 @@ static DEFINE_PCI_DEVICE_TABLE(snd_aw2_ids) = {
MODULE_DEVICE_TABLE(pci, snd_aw2_ids);
/* pci_driver definition */
static struct pci_driver driver = {
static struct pci_driver aw2_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_aw2_ids,
.probe = snd_aw2_probe,
.remove = __devexit_p(snd_aw2_remove),
};
module_pci_driver(aw2_driver);
/* operators for playback PCM alsa interface */
static struct snd_pcm_ops snd_aw2_playback_ops = {
.open = snd_aw2_pcm_playback_open,
@ -217,23 +217,6 @@ static struct snd_kcontrol_new aw2_control __devinitdata = {
* FUNCTION IMPLEMENTATIONS
********************************/
/* initialization of the module */
static int __init alsa_card_aw2_init(void)
{
snd_printdd(KERN_DEBUG "aw2: Load aw2 module\n");
return pci_register_driver(&driver);
}
/* clean up the module */
static void __exit alsa_card_aw2_exit(void)
{
snd_printdd(KERN_DEBUG "aw2: Unload aw2 module\n");
pci_unregister_driver(&driver);
}
module_init(alsa_card_aw2_init);
module_exit(alsa_card_aw2_exit);
/* component-destructor */
static int snd_aw2_dev_free(struct snd_device *device)
{

23
sound/pci/azt3328.c
View File

@ -2862,7 +2862,7 @@ snd_azf3328_resume(struct pci_dev *pci)
#endif /* CONFIG_PM */
static struct pci_driver driver = {
static struct pci_driver azf3328_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_azf3328_ids,
.probe = snd_azf3328_probe,
@ -2873,23 +2873,4 @@ static struct pci_driver driver = {
#endif
};
static int __init
alsa_card_azf3328_init(void)
{
int err;
snd_azf3328_dbgcallenter();
err = pci_register_driver(&driver);
snd_azf3328_dbgcallleave();
return err;
}
static void __exit
alsa_card_azf3328_exit(void)
{
snd_azf3328_dbgcallenter();
pci_unregister_driver(&driver);
snd_azf3328_dbgcallleave();
}
module_init(alsa_card_azf3328_init)
module_exit(alsa_card_azf3328_exit)
module_pci_driver(azf3328_driver);

19
sound/pci/bt87x.c
View File

@ -836,8 +836,6 @@ static struct {
{0x7063, 0x2000}, /* pcHDTV HD-2000 TV */
};
static struct pci_driver driver;
/* return the id of the card, or a negative value if it's blacklisted */
static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
{
@ -964,24 +962,11 @@ static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
{ }
};
static struct pci_driver driver = {
static struct pci_driver bt87x_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_bt87x_ids,
.probe = snd_bt87x_probe,
.remove = __devexit_p(snd_bt87x_remove),
};
static int __init alsa_card_bt87x_init(void)
{
if (load_all)
driver.id_table = snd_bt87x_default_ids;
return pci_register_driver(&driver);
}
static void __exit alsa_card_bt87x_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_bt87x_init)
module_exit(alsa_card_bt87x_exit)
module_pci_driver(bt87x_driver);

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

@ -1932,7 +1932,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_ca0106_ids) = {
MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
// pci_driver definition
static struct pci_driver driver = {
static struct pci_driver ca0106_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_ca0106_ids,
.probe = snd_ca0106_probe,
@ -1943,17 +1943,4 @@ static struct pci_driver driver = {
#endif
};
// initialization of the module
static int __init alsa_card_ca0106_init(void)
{
return pci_register_driver(&driver);
}
// clean up the module
static void __exit alsa_card_ca0106_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_ca0106_init)
module_exit(alsa_card_ca0106_exit)
module_pci_driver(ca0106_driver);

15
sound/pci/cmipci.c
View File

@ -3398,7 +3398,7 @@ static int snd_cmipci_resume(struct pci_dev *pci)
}
#endif /* CONFIG_PM */
static struct pci_driver driver = {
static struct pci_driver cmipci_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_cmipci_ids,
.probe = snd_cmipci_probe,
@ -3409,15 +3409,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_cmipci_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_cmipci_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_cmipci_init)
module_exit(alsa_card_cmipci_exit)
module_pci_driver(cmipci_driver);

15
sound/pci/cs4281.c
View File

@ -2084,7 +2084,7 @@ static int cs4281_resume(struct pci_dev *pci)
}
#endif /* CONFIG_PM */
static struct pci_driver driver = {
static struct pci_driver cs4281_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_cs4281_ids,
.probe = snd_cs4281_probe,
@ -2095,15 +2095,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_cs4281_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_cs4281_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_cs4281_init)
module_exit(alsa_card_cs4281_exit)
module_pci_driver(cs4281_driver);

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

@ -161,7 +161,7 @@ static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver cs46xx_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_cs46xx_ids,
.probe = snd_card_cs46xx_probe,
@ -172,15 +172,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_cs46xx_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_cs46xx_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_cs46xx_init)
module_exit(alsa_card_cs46xx_exit)
module_pci_driver(cs46xx_driver);

16
sound/pci/cs5530.c
View File

@ -291,23 +291,11 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
return 0;
}
static struct pci_driver driver = {
static struct pci_driver cs5530_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_cs5530_ids,
.probe = snd_cs5530_probe,
.remove = __devexit_p(snd_cs5530_remove),
};
static int __init alsa_card_cs5530_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_cs5530_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_cs5530_init)
module_exit(alsa_card_cs5530_exit)
module_pci_driver(cs5530_driver);

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

@ -394,7 +394,7 @@ static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver cs5535audio_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_cs5535audio_ids,
.probe = snd_cs5535audio_probe,
@ -405,18 +405,7 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_cs5535audio_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_cs5535audio_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_cs5535audio_init)
module_exit(alsa_card_cs5535audio_exit)
module_pci_driver(cs5535audio_driver);
MODULE_AUTHOR("Jaya Kumar");
MODULE_LICENSE("GPL");

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

@ -154,15 +154,4 @@ static struct pci_driver ct_driver = {
#endif
};
static int __init ct_card_init(void)
{
return pci_register_driver(&ct_driver);
}
static void __exit ct_card_exit(void)
{
pci_unregister_driver(&ct_driver);
}
module_init(ct_card_init)
module_exit(ct_card_exit)
module_pci_driver(ct_driver);

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

@ -2328,7 +2328,7 @@ static void __devexit snd_echo_remove(struct pci_dev *pci)
******************************************************************************/
/* pci_driver definition */
static struct pci_driver driver = {
static struct pci_driver echo_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_echo_ids,
.probe = snd_echo_probe,
@ -2339,22 +2339,4 @@ static struct pci_driver driver = {
#endif /* CONFIG_PM */
};
/* initialization of the module */
static int __init alsa_card_echo_init(void)
{
return pci_register_driver(&driver);
}
/* clean up the module */
static void __exit alsa_card_echo_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_echo_init)
module_exit(alsa_card_echo_exit)
module_pci_driver(echo_driver);

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

@ -263,7 +263,7 @@ static int snd_emu10k1_resume(struct pci_dev *pci)
}
#endif
static struct pci_driver driver = {
static struct pci_driver emu10k1_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_emu10k1_ids,
.probe = snd_card_emu10k1_probe,
@ -274,15 +274,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_emu10k1_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_emu10k1_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_emu10k1_init)
module_exit(alsa_card_emu10k1_exit)
module_pci_driver(emu10k1_driver);

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

@ -1612,24 +1612,11 @@ static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = {
MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
// pci_driver definition
static struct pci_driver driver = {
static struct pci_driver emu10k1x_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_emu10k1x_ids,
.probe = snd_emu10k1x_probe,
.remove = __devexit_p(snd_emu10k1x_remove),
};
// initialization of the module
static int __init alsa_card_emu10k1x_init(void)
{
return pci_register_driver(&driver);
}
// clean up the module
static void __exit alsa_card_emu10k1x_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_emu10k1x_init)
module_exit(alsa_card_emu10k1x_exit)
module_pci_driver(emu10k1x_driver);

15
sound/pci/ens1370.c
View File

@ -2488,7 +2488,7 @@ static void __devexit snd_audiopci_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver ens137x_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_audiopci_ids,
.probe = snd_audiopci_probe,
@ -2499,15 +2499,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_ens137x_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_ens137x_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_ens137x_init)
module_exit(alsa_card_ens137x_exit)
module_pci_driver(ens137x_driver);

15
sound/pci/es1938.c
View File

@ -1882,7 +1882,7 @@ static void __devexit snd_es1938_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver es1938_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_es1938_ids,
.probe = snd_es1938_probe,
@ -1893,15 +1893,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_es1938_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_es1938_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_es1938_init)
module_exit(alsa_card_es1938_exit)
module_pci_driver(es1938_driver);

15
sound/pci/es1968.c
View File

@ -2898,7 +2898,7 @@ static void __devexit snd_es1968_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver es1968_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_es1968_ids,
.probe = snd_es1968_probe,
@ -2909,15 +2909,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_es1968_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_es1968_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_es1968_init)
module_exit(alsa_card_es1968_exit)
module_pci_driver(es1968_driver);

15
sound/pci/fm801.c
View File

@ -1416,7 +1416,7 @@ static int snd_fm801_resume(struct pci_dev *pci)
}
#endif
static struct pci_driver driver = {
static struct pci_driver fm801_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_fm801_ids,
.probe = snd_card_fm801_probe,
@ -1427,15 +1427,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_fm801_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_fm801_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_fm801_init)
module_exit(alsa_card_fm801_exit)
module_pci_driver(fm801_driver);

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

@ -3134,7 +3134,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
MODULE_DEVICE_TABLE(pci, azx_ids);
/* pci_driver definition */
static struct pci_driver driver = {
static struct pci_driver azx_driver = {
.name = KBUILD_MODNAME,
.id_table = azx_ids,
.probe = azx_probe,
@ -3145,15 +3145,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_azx_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_azx_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_azx_init)
module_exit(alsa_card_azx_exit)
module_pci_driver(azx_driver);

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

@ -2803,22 +2803,11 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver ice1712_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_ice1712_ids,
.probe = snd_ice1712_probe,
.remove = __devexit_p(snd_ice1712_remove),
};
static int __init alsa_card_ice1712_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_ice1712_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_ice1712_init)
module_exit(alsa_card_ice1712_exit)
module_pci_driver(ice1712_driver);

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

@ -2873,7 +2873,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
}
#endif
static struct pci_driver driver = {
static struct pci_driver vt1724_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_vt1724_ids,
.probe = snd_vt1724_probe,
@ -2884,15 +2884,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_ice1724_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_ice1724_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_ice1724_init)
module_exit(alsa_card_ice1724_exit)
module_pci_driver(vt1724_driver);

16
sound/pci/intel8x0.c
View File

@ -3338,7 +3338,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver intel8x0_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_intel8x0_ids,
.probe = snd_intel8x0_probe,
@ -3349,16 +3349,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_intel8x0_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_intel8x0_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_intel8x0_init)
module_exit(alsa_card_intel8x0_exit)
module_pci_driver(intel8x0_driver);

16
sound/pci/intel8x0m.c
View File

@ -1324,7 +1324,7 @@ static void __devexit snd_intel8x0m_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver intel8x0m_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_intel8x0m_ids,
.probe = snd_intel8x0m_probe,
@ -1335,16 +1335,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_intel8x0m_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_intel8x0m_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_intel8x0m_init)
module_exit(alsa_card_intel8x0m_exit)
module_pci_driver(intel8x0m_driver);

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

@ -2476,22 +2476,11 @@ static void __devexit snd_korg1212_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver korg1212_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_korg1212_ids,
.probe = snd_korg1212_probe,
.remove = __devexit_p(snd_korg1212_remove),
};
static int __init alsa_card_korg1212_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_korg1212_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_korg1212_init)
module_exit(alsa_card_korg1212_exit)
module_pci_driver(korg1212_driver);

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

@ -770,22 +770,11 @@ static DEFINE_PCI_DEVICE_TABLE(lola_ids) = {
MODULE_DEVICE_TABLE(pci, lola_ids);
/* pci_driver definition */
static struct pci_driver driver = {
static struct pci_driver lola_driver = {
.name = KBUILD_MODNAME,
.id_table = lola_ids,
.probe = lola_probe,
.remove = __devexit_p(lola_remove),
};
static int __init alsa_card_lola_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_lola_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_lola_init)
module_exit(alsa_card_lola_exit)
module_pci_driver(lola_driver);

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

@ -1141,24 +1141,11 @@ static void __devexit snd_lx6464es_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
static struct pci_driver lx6464es_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_lx6464es_ids,
.probe = snd_lx6464es_probe,
.remove = __devexit_p(snd_lx6464es_remove),
};
/* module initialization */
static int __init mod_init(void)
{
return pci_register_driver(&driver);
}
static void __exit mod_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(mod_init);
module_exit(mod_exit);
module_pci_driver(lx6464es_driver);

15
sound/pci/maestro3.c
View File

@ -2837,7 +2837,7 @@ static void __devexit snd_m3_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver m3_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_m3_ids,
.probe = snd_m3_probe,
@ -2848,15 +2848,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_m3_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_m3_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_m3_init)
module_exit(alsa_card_m3_exit)
module_pci_driver(m3_driver);

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

@ -1380,22 +1380,11 @@ static void __devexit snd_mixart_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver mixart_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_mixart_ids,
.probe = snd_mixart_probe,
.remove = __devexit_p(snd_mixart_remove),
};
static int __init alsa_card_mixart_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_mixart_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_mixart_init)
module_exit(alsa_card_mixart_exit)
module_pci_driver(mixart_driver);

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

@ -1742,7 +1742,7 @@ static void __devexit snd_nm256_remove(struct pci_dev *pci)
}
static struct pci_driver driver = {
static struct pci_driver nm256_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_nm256_ids,
.probe = snd_nm256_probe,
@ -1753,16 +1753,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_nm256_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_nm256_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_nm256_init)
module_exit(alsa_card_nm256_exit)
module_pci_driver(nm256_driver);

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

@ -870,15 +870,4 @@ static struct pci_driver oxygen_driver = {
#endif
};
static int __init alsa_card_oxygen_init(void)
{
return pci_register_driver(&oxygen_driver);
}
static void __exit alsa_card_oxygen_exit(void)
{
pci_unregister_driver(&oxygen_driver);
}
module_init(alsa_card_oxygen_init)
module_exit(alsa_card_oxygen_exit)
module_pci_driver(oxygen_driver);

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

@ -100,15 +100,4 @@ static struct pci_driver xonar_driver = {
.shutdown = oxygen_pci_shutdown,
};
static int __init alsa_card_xonar_init(void)
{
return pci_register_driver(&xonar_driver);
}
static void __exit alsa_card_xonar_exit(void)
{
pci_unregister_driver(&xonar_driver);
}
module_init(alsa_card_xonar_init)
module_exit(alsa_card_xonar_exit)
module_pci_driver(xonar_driver);

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

@ -1607,22 +1607,11 @@ static void __devexit pcxhr_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver pcxhr_driver = {
.name = KBUILD_MODNAME,
.id_table = pcxhr_ids,
.probe = pcxhr_probe,
.remove = __devexit_p(pcxhr_remove),
};
static int __init pcxhr_module_init(void)
{
return pci_register_driver(&driver);
}
static void __exit pcxhr_module_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(pcxhr_module_init)
module_exit(pcxhr_module_exit)
module_pci_driver(pcxhr_driver);

15
sound/pci/rme32.c
View File

@ -1984,22 +1984,11 @@ static void __devexit snd_rme32_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver rme32_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_rme32_ids,
.probe = snd_rme32_probe,
.remove = __devexit_p(snd_rme32_remove),
};
static int __init alsa_card_rme32_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_rme32_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_rme32_init)
module_exit(alsa_card_rme32_exit)
module_pci_driver(rme32_driver);

15
sound/pci/rme96.c
View File

@ -2395,22 +2395,11 @@ static void __devexit snd_rme96_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver rme96_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_rme96_ids,
.probe = snd_rme96_probe,
.remove = __devexit_p(snd_rme96_remove),
};
static int __init alsa_card_rme96_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_rme96_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_rme96_init)
module_exit(alsa_card_rme96_exit)
module_pci_driver(rme96_driver);

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

@ -5635,22 +5635,11 @@ static void __devexit snd_hdsp_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver hdsp_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_hdsp_ids,
.probe = snd_hdsp_probe,
.remove = __devexit_p(snd_hdsp_remove),
};
static int __init alsa_card_hdsp_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_hdsp_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_hdsp_init)
module_exit(alsa_card_hdsp_exit)
module_pci_driver(hdsp_driver);

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

@ -6918,23 +6918,11 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver hdspm_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_hdspm_ids,
.probe = snd_hdspm_probe,
.remove = __devexit_p(snd_hdspm_remove),
};
static int __init alsa_card_hdspm_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_hdspm_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_hdspm_init)
module_exit(alsa_card_hdspm_exit)
module_pci_driver(hdspm_driver);

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

@ -2631,22 +2631,11 @@ static void __devexit snd_rme9652_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver rme9652_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_rme9652_ids,
.probe = snd_rme9652_probe,
.remove = __devexit_p(snd_rme9652_remove),
};
static int __init alsa_card_hammerfall_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_hammerfall_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_hammerfall_init)
module_exit(alsa_card_hammerfall_exit)
module_pci_driver(rme9652_driver);

13
sound/pci/sis7019.c
View File

@ -1488,15 +1488,4 @@ static struct pci_driver sis7019_driver = {
#endif
};
static int __init sis7019_init(void)
{
return pci_register_driver(&sis7019_driver);
}
static void __exit sis7019_exit(void)
{
pci_unregister_driver(&sis7019_driver);
}
module_init(sis7019_init);
module_exit(sis7019_exit);
module_pci_driver(sis7019_driver);

15
sound/pci/sonicvibes.c
View File

@ -1530,22 +1530,11 @@ static void __devexit snd_sonic_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver sonicvibes_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_sonic_ids,
.probe = snd_sonic_probe,
.remove = __devexit_p(snd_sonic_remove),
};
static int __init alsa_card_sonicvibes_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_sonicvibes_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_sonicvibes_init)
module_exit(alsa_card_sonicvibes_exit)
module_pci_driver(sonicvibes_driver);

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

@ -172,7 +172,7 @@ static void __devexit snd_trident_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver trident_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_trident_ids,
.probe = snd_trident_probe,
@ -183,15 +183,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_trident_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_trident_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_trident_init)
module_exit(alsa_card_trident_exit)
module_pci_driver(trident_driver);

15
sound/pci/via82xx.c
View File

@ -2619,7 +2619,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver via82xx_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_via82xx_ids,
.probe = snd_via82xx_probe,
@ -2630,15 +2630,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_via82xx_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_via82xx_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_via82xx_init)
module_exit(alsa_card_via82xx_exit)
module_pci_driver(via82xx_driver);

15
sound/pci/via82xx_modem.c
View File

@ -1223,7 +1223,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver via82xx_modem_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_via82xx_modem_ids,
.probe = snd_via82xx_probe,
@ -1234,15 +1234,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_via82xx_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_via82xx_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_via82xx_init)
module_exit(alsa_card_via82xx_exit)
module_pci_driver(via82xx_modem_driver);

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

@ -289,7 +289,7 @@ static int snd_vx222_resume(struct pci_dev *pci)
}
#endif
static struct pci_driver driver = {
static struct pci_driver vx222_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_vx222_ids,
.probe = snd_vx222_probe,
@ -300,15 +300,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_vx222_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_vx222_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_vx222_init)
module_exit(alsa_card_vx222_exit)
module_pci_driver(vx222_driver);

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

@ -350,7 +350,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
static struct pci_driver driver = {
static struct pci_driver ymfpci_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_ymfpci_ids,
.probe = snd_card_ymfpci_probe,
@ -361,15 +361,4 @@ static struct pci_driver driver = {
#endif
};
static int __init alsa_card_ymfpci_init(void)
{
return pci_register_driver(&driver);
}
static void __exit alsa_card_ymfpci_exit(void)
{
pci_unregister_driver(&driver);
}
module_init(alsa_card_ymfpci_init)
module_exit(alsa_card_ymfpci_exit)
module_pci_driver(ymfpci_driver);