2007-02-01 01:10:57

by Jay Cliburn

[permalink] [raw]
Subject: [PATCH 2.6.20-rc7 1/2] atl1: get rid of pci_module_init

From: Jay Cliburn <[email protected]>

pci_module_init is deprecated. Use pci_register_driver instead.
Discovered by and modification suggested by Alan Cox.

Signed-off-by: Jay Cliburn <[email protected]>
---

drivers/net/atl1/atl1_main.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 0afa9c1..793c43b 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -2461,12 +2461,9 @@ static void __exit atl1_exit_module(void)
*/
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-02-02 13:28:35

by Jeff Garzik

[permalink] [raw]
Subject: Re: [PATCH 2.6.20-rc7 1/2] atl1: get rid of pci_module_init

Jay Cliburn wrote:
> From: Jay Cliburn <[email protected]>
>
> pci_module_init is deprecated. Use pci_register_driver instead.
> Discovered by and modification suggested by Alan Cox.
>
> Signed-off-by: Jay Cliburn <[email protected]>

applied 1-2 to #atl1