aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/bt87x.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-04-24 06:25:00 -0400
committerTakashi Iwai <tiwai@suse.de>2012-04-24 06:25:00 -0400
commite9f66d9b9ce03f74a52894cebedf12b67f65dd24 (patch)
tree6fc07ea37548ac3c9f808ee25c10fcfeb34236ea /sound/pci/bt87x.c
parent68853fa30cdb6a9a92f7ab46c34aedb24b2f9d56 (diff)
ALSA: pci: clean up using module_pci_driver()
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/bt87x.c')
-rw-r--r--sound/pci/bt87x.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 62d6163fc9d9..b6a95eeca095 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -836,8 +836,6 @@ static struct {
836 {0x7063, 0x2000}, /* pcHDTV HD-2000 TV */ 836 {0x7063, 0x2000}, /* pcHDTV HD-2000 TV */
837}; 837};
838 838
839static struct pci_driver driver;
840
841/* return the id of the card, or a negative value if it's blacklisted */ 839/* return the id of the card, or a negative value if it's blacklisted */
842static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) 840static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
843{ 841{
@@ -964,24 +962,11 @@ static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
964 { } 962 { }
965}; 963};
966 964
967static struct pci_driver driver = { 965static struct pci_driver bt87x_driver = {
968 .name = KBUILD_MODNAME, 966 .name = KBUILD_MODNAME,
969 .id_table = snd_bt87x_ids, 967 .id_table = snd_bt87x_ids,
970 .probe = snd_bt87x_probe, 968 .probe = snd_bt87x_probe,
971 .remove = __devexit_p(snd_bt87x_remove), 969 .remove = __devexit_p(snd_bt87x_remove),
972}; 970};
973 971
974static int __init alsa_card_bt87x_init(void) 972module_pci_driver(bt87x_driver);
975{
976 if (load_all)
977 driver.id_table = snd_bt87x_default_ids;
978 return pci_register_driver(&driver);
979}
980
981static void __exit alsa_card_bt87x_exit(void)
982{
983 pci_unregister_driver(&driver);
984}
985
986module_init(alsa_card_bt87x_init)
987module_exit(alsa_card_bt87x_exit)