Skip to contentSkip to conversation

atl1_main: pci_module_int returns to haunt us

PATCH In review Alan 2 participants 2 messages Jan 31, 2007 Network drivers

lore
Share & tools
lore

Alan

author
#0 lore raw

PATCH 1/1 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]>
drivers/net/atl1/atl1_main.c +1 -4
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
@@ -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);
#1 lore raw
Quoted 13 lines · Alan

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

drivers/net/atl1/atl1_main.c +0 -0
@@ -2482,12 +2482,9 @@
  **/
 static int __init atl1_init_module(void)
 {

drivers/net/atl1/atl1_main.c line 2490

Quoted 10 lines
drivers/net/atl1/atl1_main.c +1 -4
-	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