From: Christophe Lucas Subject: [KJ] [PATCH][RESEND] 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 Signed-off-by: Domen Puncer --- dscc4.c | 2 +- farsync.c | 2 +- pc300_drv.c | 2 +- pci200syn.c | 2 +- wanxl.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) Index: quilt/drivers/net/wan/dscc4.c =================================================================== --- quilt.orig/drivers/net/wan/dscc4.c +++ quilt/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) Index: quilt/drivers/net/wan/farsync.c =================================================================== --- quilt.orig/drivers/net/wan/farsync.c +++ quilt/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 Index: quilt/drivers/net/wan/pc300_drv.c =================================================================== --- quilt.orig/drivers/net/wan/pc300_drv.c +++ quilt/drivers/net/wan/pc300_drv.c @@ -3676,7 +3676,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) Index: quilt/drivers/net/wan/pci200syn.c =================================================================== --- quilt.orig/drivers/net/wan/pci200syn.c +++ quilt/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); } Index: quilt/drivers/net/wan/wanxl.c =================================================================== --- quilt.orig/drivers/net/wan/wanxl.c +++ quilt/drivers/net/wan/wanxl.c @@ -822,7 +822,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)