Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9f66d9b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pci: clean up using module_pci_driver() 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 68853fa3

sound/pci/ad1889.c

+1 −14
Original line number Diff line number Diff line
@@ -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);

sound/pci/ali5451/ali5451.c

+2 −13
Original line number Diff line number Diff line
@@ -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);

sound/pci/als300.c

+2 −13
Original line number Diff line number Diff line
@@ -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);

sound/pci/als4000.c

+2 −13
Original line number Diff line number Diff line
@@ -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);

sound/pci/asihpi/asihpi.c

+2 −17
Original line number Diff line number Diff line
@@ -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);