2007-01-31 16:52:48

by Alan

Subject: [PATCH] atl1_main: pci_module_int returns to haunt us

Perhaps Adrian would care to simply delete the pci_module_init ancient compat
code so nobody else can inadvertently merge a driver that uses it.

Signed-off-by: Alan Cox <[email protected]>


diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c linux-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c
--- linux.vanilla-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c 2007-01-31 14:20:41.000000000 +0000
+++ linux-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c 2007-01-31 15:25:29.083361224 +0000
@@ -2482,12 +2482,9 @@
**/
static int __init atl1_init_module(void)
{
- int ret;
printk(KERN_INFO "%s - version %s\n", atl1_driver_string, DRIVER_VERSION);
printk(KERN_INFO "%s\n", atl1_copyright);
- ret = pci_module_init(&atl1_driver);
-
- return ret;
+ return pci_register_driver(&atl1_driver);
}

module_init(atl1_init_module);

2007-01-31 22:07:33

by Jay Cliburn

Subject: Re: [PATCH] atl1_main: pci_module_int returns to haunt us

Alan wrote:
> Perhaps Adrian would care to simply delete the pci_module_init ancient compat
> code so nobody else can inadvertently merge a driver that uses it.
>
> Signed-off-by: Alan Cox <[email protected]>
>
>
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c linux-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c
> --- linux.vanilla-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c 2007-01-31 14:20:41.000000000 +0000
> +++ linux-2.6.20-rc6-mm3/drivers/net/atl1/atl1_main.c 2007-01-31 15:25:29.083361224 +0000
> @@ -2482,12 +2482,9 @@
> **/
> static int __init atl1_init_module(void)
> {
> - int ret;
> printk(KERN_INFO "%s - version %s\n", atl1_driver_string, DRIVER_VERSION);
> printk(KERN_INFO "%s\n", atl1_copyright);
> - ret = pci_module_init(&atl1_driver);
> -
> - return ret;
> + return pci_register_driver(&atl1_driver);
> }
>
> module_init(atl1_init_module);

Ack. As expected, works fine. Thanks.

Jay