mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
[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>
This commit is contained in:
parent
9bfab8cec6
commit
46654728b5
16 changed files with 16 additions and 16 deletions
|
@ -1089,7 +1089,7 @@ static struct pci_driver ad1889_driver = {
|
|||
|
||||
static int __init ad1889_init_module(void)
|
||||
{
|
||||
return pci_module_init(&ad1889_driver);
|
||||
return pci_register_driver(&ad1889_driver);
|
||||
}
|
||||
|
||||
static void ad1889_exit_module(void)
|
||||
|
|
|
@ -1101,7 +1101,7 @@ static int btaudio_init_module(void)
|
|||
digital ? "digital" : "",
|
||||
analog && digital ? "+" : "",
|
||||
analog ? "analog" : "");
|
||||
return pci_module_init(&btaudio_pci_driver);
|
||||
return pci_register_driver(&btaudio_pci_driver);
|
||||
}
|
||||
|
||||
static void btaudio_cleanup_module(void)
|
||||
|
|
|
@ -3366,7 +3366,7 @@ static struct pci_driver cm_driver = {
|
|||
static int __init init_cmpci(void)
|
||||
{
|
||||
printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n");
|
||||
return pci_module_init(&cm_driver);
|
||||
return pci_register_driver(&cm_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_cmpci(void)
|
||||
|
|
|
@ -4461,7 +4461,7 @@ static int __init cs4281_init_module(void)
|
|||
printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
|
||||
__DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
|
||||
CS4281_ARCH);
|
||||
rtn = pci_module_init(&cs4281_pci_driver);
|
||||
rtn = pci_register_driver(&cs4281_pci_driver);
|
||||
|
||||
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,
|
||||
printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
|
||||
|
|
|
@ -5690,7 +5690,7 @@ static int __init cs46xx_init_module(void)
|
|||
int rtn = 0;
|
||||
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
|
||||
"cs46xx: cs46xx_init_module()+ \n"));
|
||||
rtn = pci_module_init(&cs46xx_pci_driver);
|
||||
rtn = pci_register_driver(&cs46xx_pci_driver);
|
||||
|
||||
if(rtn == -ENODEV)
|
||||
{
|
||||
|
|
|
@ -1428,7 +1428,7 @@ static int __init emu10k1_init_module(void)
|
|||
{
|
||||
printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n");
|
||||
|
||||
return pci_module_init(&emu10k1_pci_driver);
|
||||
return pci_register_driver(&emu10k1_pci_driver);
|
||||
}
|
||||
|
||||
static void __exit emu10k1_cleanup_module(void)
|
||||
|
|
|
@ -2779,7 +2779,7 @@ static struct pci_driver es1370_driver = {
|
|||
static int __init init_es1370(void)
|
||||
{
|
||||
printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n");
|
||||
return pci_module_init(&es1370_driver);
|
||||
return pci_register_driver(&es1370_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_es1370(void)
|
||||
|
|
|
@ -3090,7 +3090,7 @@ static struct pci_driver es1371_driver = {
|
|||
static int __init init_es1371(void)
|
||||
{
|
||||
printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");
|
||||
return pci_module_init(&es1371_driver);
|
||||
return pci_register_driver(&es1371_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_es1371(void)
|
||||
|
|
|
@ -2206,7 +2206,7 @@ static struct pci_driver it8172_driver = {
|
|||
static int __init init_it8172(void)
|
||||
{
|
||||
info("version v0.5 time " __TIME__ " " __DATE__);
|
||||
return pci_module_init(&it8172_driver);
|
||||
return pci_register_driver(&it8172_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_it8172(void)
|
||||
|
|
|
@ -218,7 +218,7 @@ static struct pci_driver kahlua_driver = {
|
|||
static int __init kahlua_init_module(void)
|
||||
{
|
||||
printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");
|
||||
return pci_module_init(&kahlua_driver);
|
||||
return pci_register_driver(&kahlua_driver);
|
||||
}
|
||||
|
||||
static void __devexit kahlua_cleanup_module(void)
|
||||
|
|
|
@ -3624,7 +3624,7 @@ static int __init init_maestro(void)
|
|||
{
|
||||
int rc;
|
||||
|
||||
rc = pci_module_init(&maestro_pci_driver);
|
||||
rc = pci_register_driver(&maestro_pci_driver);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
|
|
|
@ -2045,7 +2045,7 @@ static struct pci_driver vrc5477_ac97_driver = {
|
|||
static int __init init_vrc5477_ac97(void)
|
||||
{
|
||||
printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n");
|
||||
return pci_module_init(&vrc5477_ac97_driver);
|
||||
return pci_register_driver(&vrc5477_ac97_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_vrc5477_ac97(void)
|
||||
|
|
|
@ -1644,7 +1644,7 @@ module_param(force_load, bool, 0);
|
|||
static int __init do_init_nm256(void)
|
||||
{
|
||||
printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
|
||||
return pci_module_init(&nm256_pci_driver);
|
||||
return pci_register_driver(&nm256_pci_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_nm256 (void)
|
||||
|
|
|
@ -1095,7 +1095,7 @@ static int __init init_rme96xx(void)
|
|||
devices = ((devices-1) & RME96xx_MASK_DEVS) + 1;
|
||||
printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices);
|
||||
numcards = 0;
|
||||
return pci_module_init(&rme96xx_driver);
|
||||
return pci_register_driver(&rme96xx_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_rme96xx(void)
|
||||
|
|
|
@ -2765,7 +2765,7 @@ static int __init init_sonicvibes(void)
|
|||
if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT)))
|
||||
printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n");
|
||||
#endif
|
||||
return pci_module_init(&sv_driver);
|
||||
return pci_register_driver(&sv_driver);
|
||||
}
|
||||
|
||||
static void __exit cleanup_sonicvibes(void)
|
||||
|
|
|
@ -2680,7 +2680,7 @@ static struct pci_driver ymfpci_driver = {
|
|||
|
||||
static int __init ymf_init_module(void)
|
||||
{
|
||||
return pci_module_init(&ymfpci_driver);
|
||||
return pci_register_driver(&ymfpci_driver);
|
||||
}
|
||||
|
||||
static void __exit ymf_cleanup_module (void)
|
||||
|
|
Loading…
Reference in a new issue