diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-04-24 06:25:00 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-04-24 06:25:00 -0400 |
commit | e9f66d9b9ce03f74a52894cebedf12b67f65dd24 (patch) | |
tree | 6fc07ea37548ac3c9f808ee25c10fcfeb34236ea /sound/pci/ice1712 | |
parent | 68853fa30cdb6a9a92f7ab46c34aedb24b2f9d56 (diff) |
ALSA: pci: clean up using module_pci_driver()
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 15 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 15 |
2 files changed, 4 insertions, 26 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 132a86e09d0..5be2e120a14 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2803,22 +2803,11 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci) | |||
2803 | pci_set_drvdata(pci, NULL); | 2803 | pci_set_drvdata(pci, NULL); |
2804 | } | 2804 | } |
2805 | 2805 | ||
2806 | static struct pci_driver driver = { | 2806 | static struct pci_driver ice1712_driver = { |
2807 | .name = KBUILD_MODNAME, | 2807 | .name = KBUILD_MODNAME, |
2808 | .id_table = snd_ice1712_ids, | 2808 | .id_table = snd_ice1712_ids, |
2809 | .probe = snd_ice1712_probe, | 2809 | .probe = snd_ice1712_probe, |
2810 | .remove = __devexit_p(snd_ice1712_remove), | 2810 | .remove = __devexit_p(snd_ice1712_remove), |
2811 | }; | 2811 | }; |
2812 | 2812 | ||
2813 | static int __init alsa_card_ice1712_init(void) | 2813 | module_pci_driver(ice1712_driver); |
2814 | { | ||
2815 | return pci_register_driver(&driver); | ||
2816 | } | ||
2817 | |||
2818 | static void __exit alsa_card_ice1712_exit(void) | ||
2819 | { | ||
2820 | pci_unregister_driver(&driver); | ||
2821 | } | ||
2822 | |||
2823 | module_init(alsa_card_ice1712_init) | ||
2824 | module_exit(alsa_card_ice1712_exit) | ||
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 812d10e43ae..a01a00d1cf4 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2873,7 +2873,7 @@ static int snd_vt1724_resume(struct pci_dev *pci) | |||
2873 | } | 2873 | } |
2874 | #endif | 2874 | #endif |
2875 | 2875 | ||
2876 | static struct pci_driver driver = { | 2876 | static struct pci_driver vt1724_driver = { |
2877 | .name = KBUILD_MODNAME, | 2877 | .name = KBUILD_MODNAME, |
2878 | .id_table = snd_vt1724_ids, | 2878 | .id_table = snd_vt1724_ids, |
2879 | .probe = snd_vt1724_probe, | 2879 | .probe = snd_vt1724_probe, |
@@ -2884,15 +2884,4 @@ static struct pci_driver driver = { | |||
2884 | #endif | 2884 | #endif |
2885 | }; | 2885 | }; |
2886 | 2886 | ||
2887 | static int __init alsa_card_ice1724_init(void) | 2887 | module_pci_driver(vt1724_driver); |
2888 | { | ||
2889 | return pci_register_driver(&driver); | ||
2890 | } | ||
2891 | |||
2892 | static void __exit alsa_card_ice1724_exit(void) | ||
2893 | { | ||
2894 | pci_unregister_driver(&driver); | ||
2895 | } | ||
2896 | |||
2897 | module_init(alsa_card_ice1724_init) | ||
2898 | module_exit(alsa_card_ice1724_exit) | ||