From: Takashi Iwai Date: Thu, 26 Apr 2012 05:19:39 +0000 (+0200) Subject: ALSA: asihpi - Revert module_pci_driver conversion for asihpi.c X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a442cc3df1427c9797085218a6f9acae0b68b15;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ALSA: asihpi - Revert module_pci_driver conversion for asihpi.c It contains non-standard call. Reported-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 7b5259b6032f..e8de831f98bc 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -2963,7 +2963,7 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = { }; MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl); -static struct pci_driver asihpi_driver = { +static struct pci_driver driver = { .name = KBUILD_MODNAME, .id_table = asihpi_pci_tbl, .probe = snd_asihpi_probe, @@ -2974,4 +2974,19 @@ static struct pci_driver asihpi_driver = { #endif }; -module_pci_driver(asihpi_driver); +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) +