drivers/net/wan/*: convert to pci_register_driver

PATCH Applied [email protected] 1 participant 1 message Mar 6, 2005

Subsystems (5)

Networking Network drivers Generic hdlc (wan) drivers Cyclades PC300 driver +1 more subsystems

lore

Share & tools

lore

[email protected]

author

2005-03-06 10:33 UTC #0 lore raw

PATCH 23/26 drivers/net/wan/*: convert to pci_register_driver

convert from pci_module_init to pci_register_driver (from:http://kerneljanitors.org/TODO).

Signed-off-by Christophe Lucas <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/drivers/net/wan/dscc4.c     |    2 +-
 kj-domen/drivers/net/wan/farsync.c   |    2 +-
 kj-domen/drivers/net/wan/pc300_drv.c |    2 +-
 kj-domen/drivers/net/wan/pci200syn.c |    2 +-
 kj-domen/drivers/net/wan/wanxl.c     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

drivers/net/wan/dscc4.c renamed from drivers/net/wan/dscc4.c~pci_register_driver-drivers_net_wan +1 -1

diff -puN drivers/net/wan/dscc4.c~pci_register_driver-drivers_net_wan drivers/net/wan/dscc4.c
@@ -2062,7 +2062,7 @@ static struct pci_driver dscc4_driver = 
 
 static int __init dscc4_init_module(void)
 {
-	return pci_module_init(&dscc4_driver);
+	return pci_register_driver(&dscc4_driver);
 }
 
 static void __exit dscc4_cleanup_module(void)

drivers/net/wan/farsync.c renamed from drivers/net/wan/farsync.c~pci_register_driver-drivers_net_wan +1 -1

diff -puN drivers/net/wan/farsync.c~pci_register_driver-drivers_net_wan drivers/net/wan/farsync.c
@@ -2699,7 +2699,7 @@ fst_init(void)
 	for (i = 0; i < FST_MAX_CARDS; i++)
 		fst_card_array[i] = NULL;
 	spin_lock_init(&fst_work_q_lock);
-	return pci_module_init(&fst_driver);
+	return pci_register_driver(&fst_driver);
 }
 
 static void __exit

drivers/net/wan/pc300_drv.c renamed from drivers/net/wan/pc300_drv.c~pci_register_driver-drivers_net_wan +1 -1

diff -puN drivers/net/wan/pc300_drv.c~pci_register_driver-drivers_net_wan drivers/net/wan/pc300_drv.c
@@ -3674,7 +3674,7 @@ static struct pci_driver cpc_driver = {
 
 static int __init cpc_init(void)
 {
-	return pci_module_init(&cpc_driver);
+	return pci_register_driver(&cpc_driver);
 }
 
 static void __exit cpc_cleanup_module(void)

drivers/net/wan/pci200syn.c renamed from drivers/net/wan/pci200syn.c~pci_register_driver-drivers_net_wan +1 -1

diff -puN drivers/net/wan/pci200syn.c~pci_register_driver-drivers_net_wan drivers/net/wan/pci200syn.c
@@ -468,7 +468,7 @@ static int __init pci200_init_module(voi
 		printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
 		return -EINVAL;
 	}
-	return pci_module_init(&pci200_pci_driver);
+	return pci_register_driver(&pci200_pci_driver);
 }

drivers/net/wan/wanxl.c renamed from drivers/net/wan/wanxl.c~pci_register_driver-drivers_net_wan +1 -1

diff -puN drivers/net/wan/wanxl.c~pci_register_driver-drivers_net_wan drivers/net/wan/wanxl.c
@@ -827,7 +827,7 @@ static int __init wanxl_init_module(void
 #ifdef MODULE
 	printk(KERN_INFO "%s\n", version);
 #endif
-	return pci_module_init(&wanxl_pci_driver);
+	return pci_register_driver(&wanxl_pci_driver);
 }
 
 static void __exit wanxl_cleanup_module(void)