Commit 46654728 authored Dec 06, 2005 by Greg Kroah-Hartman

[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>

parent 9bfab8ce

sound/oss/ad1889.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1089,7 +1089,7 @@ static struct pci_driver ad1889_driver = {

	static int __init ad1889_init_module(void)		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)		static void ad1889_exit_module(void)

sound/oss/btaudio.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1101,7 +1101,7 @@ static int btaudio_init_module(void)
	digital ? "digital" : "",		digital ? "digital" : "",
	analog && digital ? "+" : "",		analog && digital ? "+" : "",
	analog ? "analog" : "");		analog ? "analog" : "");
	return pci_module_init(&btaudio_pci_driver);		return pci_register_driver(&btaudio_pci_driver);
	}		}

	static void btaudio_cleanup_module(void)		static void btaudio_cleanup_module(void)

sound/oss/cmpci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3366,7 +3366,7 @@ static struct pci_driver cm_driver = {
	static int __init init_cmpci(void)		static int __init init_cmpci(void)
	{		{
	printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n");		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)		static void __exit cleanup_cmpci(void)

sound/oss/cs4281/cs4281m.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4461,7 +4461,7 @@ static int __init cs4281_init_module(void)
	printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "		printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
	__DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,		__DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
	CS4281_ARCH);		CS4281_ARCH);
	rtn = pci_module_init(&cs4281_pci_driver);		rtn = pci_register_driver(&cs4281_pci_driver);

	CS_DBGOUT(CS_INIT \| CS_FUNCTION, 2,		CS_DBGOUT(CS_INIT \| CS_FUNCTION, 2,
	printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));		printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));

sound/oss/cs46xx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5690,7 +5690,7 @@ static int __init cs46xx_init_module(void)
	int rtn = 0;		int rtn = 0;
	CS_DBGOUT(CS_INIT \| CS_FUNCTION, 2, printk(KERN_INFO		CS_DBGOUT(CS_INIT \| CS_FUNCTION, 2, printk(KERN_INFO
	"cs46xx: cs46xx_init_module()+ \n"));		"cs46xx: cs46xx_init_module()+ \n"));
	rtn = pci_module_init(&cs46xx_pci_driver);		rtn = pci_register_driver(&cs46xx_pci_driver);

	if(rtn == -ENODEV)		if(rtn == -ENODEV)
	{		{