[PATCH] drivers/sound/oss: Replace pci_module_init() with pci_register_driver()

Replace obsolete pci_module_init() with pci_register_driver().

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>

+16 -16
+1 -1
sound/oss/ad1889.c
··· 1089 1090 static int __init ad1889_init_module(void) 1091 { 1092 - return pci_module_init(&ad1889_driver); 1093 } 1094 1095 static void ad1889_exit_module(void)
··· 1089 1090 static int __init ad1889_init_module(void) 1091 { 1092 + return pci_register_driver(&ad1889_driver); 1093 } 1094 1095 static void ad1889_exit_module(void)
+1 -1
sound/oss/btaudio.c
··· 1101 digital ? "digital" : "", 1102 analog && digital ? "+" : "", 1103 analog ? "analog" : ""); 1104 - return pci_module_init(&btaudio_pci_driver); 1105 } 1106 1107 static void btaudio_cleanup_module(void)
··· 1101 digital ? "digital" : "", 1102 analog && digital ? "+" : "", 1103 analog ? "analog" : ""); 1104 + return pci_register_driver(&btaudio_pci_driver); 1105 } 1106 1107 static void btaudio_cleanup_module(void)
+1 -1
sound/oss/cmpci.c
··· 3366 static int __init init_cmpci(void) 3367 { 3368 printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n"); 3369 - return pci_module_init(&cm_driver); 3370 } 3371 3372 static void __exit cleanup_cmpci(void)
··· 3366 static int __init init_cmpci(void) 3367 { 3368 printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n"); 3369 + return pci_register_driver(&cm_driver); 3370 } 3371 3372 static void __exit cleanup_cmpci(void)
+1 -1
sound/oss/cs4281/cs4281m.c
··· 4461 printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " " 4462 __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION, 4463 CS4281_ARCH); 4464 - rtn = pci_module_init(&cs4281_pci_driver); 4465 4466 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, 4467 printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
··· 4461 printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " " 4462 __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION, 4463 CS4281_ARCH); 4464 + rtn = pci_register_driver(&cs4281_pci_driver); 4465 4466 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, 4467 printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
+1 -1
sound/oss/cs46xx.c
··· 5690 int rtn = 0; 5691 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 5692 "cs46xx: cs46xx_init_module()+ \n")); 5693 - rtn = pci_module_init(&cs46xx_pci_driver); 5694 5695 if(rtn == -ENODEV) 5696 {
··· 5690 int rtn = 0; 5691 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 5692 "cs46xx: cs46xx_init_module()+ \n")); 5693 + rtn = pci_register_driver(&cs46xx_pci_driver); 5694 5695 if(rtn == -ENODEV) 5696 {
+1 -1
sound/oss/emu10k1/main.c
··· 1428 { 1429 printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n"); 1430 1431 - return pci_module_init(&emu10k1_pci_driver); 1432 } 1433 1434 static void __exit emu10k1_cleanup_module(void)
··· 1428 { 1429 printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n"); 1430 1431 + return pci_register_driver(&emu10k1_pci_driver); 1432 } 1433 1434 static void __exit emu10k1_cleanup_module(void)
+1 -1
sound/oss/es1370.c
··· 2779 static int __init init_es1370(void) 2780 { 2781 printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n"); 2782 - return pci_module_init(&es1370_driver); 2783 } 2784 2785 static void __exit cleanup_es1370(void)
··· 2779 static int __init init_es1370(void) 2780 { 2781 printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n"); 2782 + return pci_register_driver(&es1370_driver); 2783 } 2784 2785 static void __exit cleanup_es1370(void)
+1 -1
sound/oss/es1371.c
··· 3090 static int __init init_es1371(void) 3091 { 3092 printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n"); 3093 - return pci_module_init(&es1371_driver); 3094 } 3095 3096 static void __exit cleanup_es1371(void)
··· 3090 static int __init init_es1371(void) 3091 { 3092 printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n"); 3093 + return pci_register_driver(&es1371_driver); 3094 } 3095 3096 static void __exit cleanup_es1371(void)
+1 -1
sound/oss/ite8172.c
··· 2206 static int __init init_it8172(void) 2207 { 2208 info("version v0.5 time " __TIME__ " " __DATE__); 2209 - return pci_module_init(&it8172_driver); 2210 } 2211 2212 static void __exit cleanup_it8172(void)
··· 2206 static int __init init_it8172(void) 2207 { 2208 info("version v0.5 time " __TIME__ " " __DATE__); 2209 + return pci_register_driver(&it8172_driver); 2210 } 2211 2212 static void __exit cleanup_it8172(void)
+1 -1
sound/oss/kahlua.c
··· 218 static int __init kahlua_init_module(void) 219 { 220 printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n"); 221 - return pci_module_init(&kahlua_driver); 222 } 223 224 static void __devexit kahlua_cleanup_module(void)
··· 218 static int __init kahlua_init_module(void) 219 { 220 printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n"); 221 + return pci_register_driver(&kahlua_driver); 222 } 223 224 static void __devexit kahlua_cleanup_module(void)
+1 -1
sound/oss/maestro.c
··· 3624 { 3625 int rc; 3626 3627 - rc = pci_module_init(&maestro_pci_driver); 3628 if (rc < 0) 3629 return rc; 3630
··· 3624 { 3625 int rc; 3626 3627 + rc = pci_register_driver(&maestro_pci_driver); 3628 if (rc < 0) 3629 return rc; 3630
+1 -1
sound/oss/nec_vrc5477.c
··· 2045 static int __init init_vrc5477_ac97(void) 2046 { 2047 printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n"); 2048 - return pci_module_init(&vrc5477_ac97_driver); 2049 } 2050 2051 static void __exit cleanup_vrc5477_ac97(void)
··· 2045 static int __init init_vrc5477_ac97(void) 2046 { 2047 printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n"); 2048 + return pci_register_driver(&vrc5477_ac97_driver); 2049 } 2050 2051 static void __exit cleanup_vrc5477_ac97(void)
+1 -1
sound/oss/nm256_audio.c
··· 1644 static int __init do_init_nm256(void) 1645 { 1646 printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n"); 1647 - return pci_module_init(&nm256_pci_driver); 1648 } 1649 1650 static void __exit cleanup_nm256 (void)
··· 1644 static int __init do_init_nm256(void) 1645 { 1646 printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n"); 1647 + return pci_register_driver(&nm256_pci_driver); 1648 } 1649 1650 static void __exit cleanup_nm256 (void)
+1 -1
sound/oss/rme96xx.c
··· 1095 devices = ((devices-1) & RME96xx_MASK_DEVS) + 1; 1096 printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices); 1097 numcards = 0; 1098 - return pci_module_init(&rme96xx_driver); 1099 } 1100 1101 static void __exit cleanup_rme96xx(void)
··· 1095 devices = ((devices-1) & RME96xx_MASK_DEVS) + 1; 1096 printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices); 1097 numcards = 0; 1098 + return pci_register_driver(&rme96xx_driver); 1099 } 1100 1101 static void __exit cleanup_rme96xx(void)
+1 -1
sound/oss/sonicvibes.c
··· 2765 if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT))) 2766 printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n"); 2767 #endif 2768 - return pci_module_init(&sv_driver); 2769 } 2770 2771 static void __exit cleanup_sonicvibes(void)
··· 2765 if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT))) 2766 printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n"); 2767 #endif 2768 + return pci_register_driver(&sv_driver); 2769 } 2770 2771 static void __exit cleanup_sonicvibes(void)
+1 -1
sound/oss/ymfpci.c
··· 2680 2681 static int __init ymf_init_module(void) 2682 { 2683 - return pci_module_init(&ymfpci_driver); 2684 } 2685 2686 static void __exit ymf_cleanup_module (void)
··· 2680 2681 static int __init ymf_init_module(void) 2682 { 2683 + return pci_register_driver(&ymfpci_driver); 2684 } 2685 2686 static void __exit ymf_cleanup_module (void)