aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-12-06 18:33:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-09 15:13:22 -0500
commit46654728b55bf5d09dc91fa45f532131d8a609f2 (patch)
treed1af8667990afe51813ba82d25f495832c7021d4 /sound/oss
parent9bfab8cec652c80b4864b4d9247520dca042c2df (diff)
[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>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/ad1889.c2
-rw-r--r--sound/oss/btaudio.c2
-rw-r--r--sound/oss/cmpci.c2
-rw-r--r--sound/oss/cs4281/cs4281m.c2
-rw-r--r--sound/oss/cs46xx.c2
-rw-r--r--sound/oss/emu10k1/main.c2
-rw-r--r--sound/oss/es1370.c2
-rw-r--r--sound/oss/es1371.c2
-rw-r--r--sound/oss/ite8172.c2
-rw-r--r--sound/oss/kahlua.c2
-rw-r--r--sound/oss/maestro.c2
-rw-r--r--sound/oss/nec_vrc5477.c2
-rw-r--r--sound/oss/nm256_audio.c2
-rw-r--r--sound/oss/rme96xx.c2
-rw-r--r--sound/oss/sonicvibes.c2
-rw-r--r--sound/oss/ymfpci.c2
16 files changed, 16 insertions, 16 deletions
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index 2cfd214e4c2a..a0d73f343100 100644
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -1089,7 +1089,7 @@ static struct pci_driver ad1889_driver = {
1089 1089
1090static int __init ad1889_init_module(void) 1090static int __init ad1889_init_module(void)
1091{ 1091{
1092 return pci_module_init(&ad1889_driver); 1092 return pci_register_driver(&ad1889_driver);
1093} 1093}
1094 1094
1095static void ad1889_exit_module(void) 1095static void ad1889_exit_module(void)
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index a85093fec7be..4007a5680acb 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -1101,7 +1101,7 @@ static int btaudio_init_module(void)
1101 digital ? "digital" : "", 1101 digital ? "digital" : "",
1102 analog && digital ? "+" : "", 1102 analog && digital ? "+" : "",
1103 analog ? "analog" : ""); 1103 analog ? "analog" : "");
1104 return pci_module_init(&btaudio_pci_driver); 1104 return pci_register_driver(&btaudio_pci_driver);
1105} 1105}
1106 1106
1107static void btaudio_cleanup_module(void) 1107static void btaudio_cleanup_module(void)
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 74dcca78c6c0..7cfbb08db537 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -3366,7 +3366,7 @@ static struct pci_driver cm_driver = {
3366static int __init init_cmpci(void) 3366static int __init init_cmpci(void)
3367{ 3367{
3368 printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n"); 3368 printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n");
3369 return pci_module_init(&cm_driver); 3369 return pci_register_driver(&cm_driver);
3370} 3370}
3371 3371
3372static void __exit cleanup_cmpci(void) 3372static void __exit cleanup_cmpci(void)
diff --git a/sound/oss/cs4281/cs4281m.c b/sound/oss/cs4281/cs4281m.c
index 46dd41dc2a34..0720365f6438 100644
--- a/sound/oss/cs4281/cs4281m.c
+++ b/sound/oss/cs4281/cs4281m.c
@@ -4461,7 +4461,7 @@ static int __init cs4281_init_module(void)
4461 printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " " 4461 printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
4462 __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION, 4462 __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
4463 CS4281_ARCH); 4463 CS4281_ARCH);
4464 rtn = pci_module_init(&cs4281_pci_driver); 4464 rtn = pci_register_driver(&cs4281_pci_driver);
4465 4465
4466 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, 4466 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,
4467 printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn)); 4467 printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index 0da4d93f04a6..58e25c82eaf2 100644
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -5690,7 +5690,7 @@ static int __init cs46xx_init_module(void)
5690 int rtn = 0; 5690 int rtn = 0;
5691 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 5691 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
5692 "cs46xx: cs46xx_init_module()+ \n")); 5692 "cs46xx: cs46xx_init_module()+ \n"));
5693 rtn = pci_module_init(&cs46xx_pci_driver); 5693 rtn = pci_register_driver(&cs46xx_pci_driver);
5694 5694
5695 if(rtn == -ENODEV) 5695 if(rtn == -ENODEV)
5696 { 5696 {
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index 9b905bae423e..23241cbdd90f 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -1428,7 +1428,7 @@ static int __init emu10k1_init_module(void)
1428{ 1428{
1429 printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n"); 1429 printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n");
1430 1430
1431 return pci_module_init(&emu10k1_pci_driver); 1431 return pci_register_driver(&emu10k1_pci_driver);
1432} 1432}
1433 1433
1434static void __exit emu10k1_cleanup_module(void) 1434static void __exit emu10k1_cleanup_module(void)
diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index 8538085086e7..ae55c536613a 100644
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -2779,7 +2779,7 @@ static struct pci_driver es1370_driver = {
2779static int __init init_es1370(void) 2779static int __init init_es1370(void)
2780{ 2780{
2781 printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n"); 2781 printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n");
2782 return pci_module_init(&es1370_driver); 2782 return pci_register_driver(&es1370_driver);
2783} 2783}
2784 2784
2785static void __exit cleanup_es1370(void) 2785static void __exit cleanup_es1370(void)
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 12a56d5ab498..5c697f162579 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -3090,7 +3090,7 @@ static struct pci_driver es1371_driver = {
3090static int __init init_es1371(void) 3090static int __init init_es1371(void)
3091{ 3091{
3092 printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n"); 3092 printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");
3093 return pci_module_init(&es1371_driver); 3093 return pci_register_driver(&es1371_driver);
3094} 3094}
3095 3095
3096static void __exit cleanup_es1371(void) 3096static void __exit cleanup_es1371(void)
diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index 26e5944b6ba8..8fd2f9a9e668 100644
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -2206,7 +2206,7 @@ static struct pci_driver it8172_driver = {
2206static int __init init_it8172(void) 2206static int __init init_it8172(void)
2207{ 2207{
2208 info("version v0.5 time " __TIME__ " " __DATE__); 2208 info("version v0.5 time " __TIME__ " " __DATE__);
2209 return pci_module_init(&it8172_driver); 2209 return pci_register_driver(&it8172_driver);
2210} 2210}
2211 2211
2212static void __exit cleanup_it8172(void) 2212static void __exit cleanup_it8172(void)
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 808c5ef969be..2835a7c038ef 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -218,7 +218,7 @@ static struct pci_driver kahlua_driver = {
218static int __init kahlua_init_module(void) 218static int __init kahlua_init_module(void)
219{ 219{
220 printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n"); 220 printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");
221 return pci_module_init(&kahlua_driver); 221 return pci_register_driver(&kahlua_driver);
222} 222}
223 223
224static void __devexit kahlua_cleanup_module(void) 224static void __devexit kahlua_cleanup_module(void)
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index f9ac5b16f61a..d4b569acf764 100644
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -3624,7 +3624,7 @@ static int __init init_maestro(void)
3624{ 3624{
3625 int rc; 3625 int rc;
3626 3626
3627 rc = pci_module_init(&maestro_pci_driver); 3627 rc = pci_register_driver(&maestro_pci_driver);
3628 if (rc < 0) 3628 if (rc < 0)
3629 return rc; 3629 return rc;
3630 3630
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index 9ac4bf7e1e89..fbb9170e8e0a 100644
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -2045,7 +2045,7 @@ static struct pci_driver vrc5477_ac97_driver = {
2045static int __init init_vrc5477_ac97(void) 2045static int __init init_vrc5477_ac97(void)
2046{ 2046{
2047 printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n"); 2047 printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n");
2048 return pci_module_init(&vrc5477_ac97_driver); 2048 return pci_register_driver(&vrc5477_ac97_driver);
2049} 2049}
2050 2050
2051static void __exit cleanup_vrc5477_ac97(void) 2051static void __exit cleanup_vrc5477_ac97(void)
diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c
index 42d8f05689c2..7de079b202f2 100644
--- a/sound/oss/nm256_audio.c
+++ b/sound/oss/nm256_audio.c
@@ -1644,7 +1644,7 @@ module_param(force_load, bool, 0);
1644static int __init do_init_nm256(void) 1644static int __init do_init_nm256(void)
1645{ 1645{
1646 printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n"); 1646 printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
1647 return pci_module_init(&nm256_pci_driver); 1647 return pci_register_driver(&nm256_pci_driver);
1648} 1648}
1649 1649
1650static void __exit cleanup_nm256 (void) 1650static void __exit cleanup_nm256 (void)
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index 318dc51009fe..faa0b7919b65 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -1095,7 +1095,7 @@ static int __init init_rme96xx(void)
1095 devices = ((devices-1) & RME96xx_MASK_DEVS) + 1; 1095 devices = ((devices-1) & RME96xx_MASK_DEVS) + 1;
1096 printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices); 1096 printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices);
1097 numcards = 0; 1097 numcards = 0;
1098 return pci_module_init(&rme96xx_driver); 1098 return pci_register_driver(&rme96xx_driver);
1099} 1099}
1100 1100
1101static void __exit cleanup_rme96xx(void) 1101static void __exit cleanup_rme96xx(void)
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 17d0e461f8d8..71b05e2f6977 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -2765,7 +2765,7 @@ static int __init init_sonicvibes(void)
2765 if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT))) 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"); 2766 printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n");
2767#endif 2767#endif
2768 return pci_module_init(&sv_driver); 2768 return pci_register_driver(&sv_driver);
2769} 2769}
2770 2770
2771static void __exit cleanup_sonicvibes(void) 2771static void __exit cleanup_sonicvibes(void)
diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index 8dae59bd05a2..f8bd72e46f57 100644
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -2680,7 +2680,7 @@ static struct pci_driver ymfpci_driver = {
2680 2680
2681static int __init ymf_init_module(void) 2681static int __init ymf_init_module(void)
2682{ 2682{
2683 return pci_module_init(&ymfpci_driver); 2683 return pci_register_driver(&ymfpci_driver);
2684} 2684}
2685 2685
2686static void __exit ymf_cleanup_module (void) 2686static void __exit ymf_cleanup_module (void)