diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-04-24 14:25:00 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-04-24 14:25:00 +0400 |
commit | e9f66d9b9ce03f74a52894cebedf12b67f65dd24 (patch) | |
tree | 6fc07ea37548ac3c9f808ee25c10fcfeb34236ea /sound/pci/bt87x.c | |
parent | 68853fa30cdb6a9a92f7ab46c34aedb24b2f9d56 (diff) | |
download | linux-e9f66d9b9ce03f74a52894cebedf12b67f65dd24.tar.xz |
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.c | 19 |
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 { {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); |