aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorRichard Knutsson <ricknu-0@student.ltu.se>2005-11-29 18:59:34 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-09 15:13:22 -0500
commit9bfab8cec652c80b4864b4d9247520dca042c2df (patch)
treed76d008e653949d7b9ead359d44c3662e99cd194 /drivers/block
parentd1d6da8f9fb9a0633a2f36b84b292752d78f7d31 (diff)
[PATCH] drivers/block: Replace pci_module_init() with pci_register_driver()
Replace obsolete pci_module_init() with pci_register_driver(). Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/DAC960.c2
-rw-r--r--drivers/block/cciss.c2
-rw-r--r--drivers/block/sx8.c2
-rw-r--r--drivers/block/umem.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 4a7bb7dfce85..6ede1f352c29 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -7179,7 +7179,7 @@ static int DAC960_init_module(void)
7179{ 7179{
7180 int ret; 7180 int ret;
7181 7181
7182 ret = pci_module_init(&DAC960_pci_driver); 7182 ret = pci_register_driver(&DAC960_pci_driver);
7183#ifdef DAC960_GAM_MINOR 7183#ifdef DAC960_GAM_MINOR
7184 if (!ret) 7184 if (!ret)
7185 DAC960_gam_init(); 7185 DAC960_gam_init();
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e4e9f255bd1f..12d7b9bdfa93 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3360,7 +3360,7 @@ static int __init cciss_init(void)
3360 printk(KERN_INFO DRIVER_NAME "\n"); 3360 printk(KERN_INFO DRIVER_NAME "\n");
3361 3361
3362 /* Register for our PCI devices */ 3362 /* Register for our PCI devices */
3363 return pci_module_init(&cciss_pci_driver); 3363 return pci_register_driver(&cciss_pci_driver);
3364} 3364}
3365 3365
3366static void __exit cciss_cleanup(void) 3366static void __exit cciss_cleanup(void)
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index c0cdc182a8b0..a7e0975c8c9f 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1755,7 +1755,7 @@ static void carm_remove_one (struct pci_dev *pdev)
1755 1755
1756static int __init carm_init(void) 1756static int __init carm_init(void)
1757{ 1757{
1758 return pci_module_init(&carm_driver); 1758 return pci_register_driver(&carm_driver);
1759} 1759}
1760 1760
1761static void __exit carm_exit(void) 1761static void __exit carm_exit(void)
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 15299e7a1ade..a3614e6a68d0 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1174,7 +1174,7 @@ static int __init mm_init(void)
1174 1174
1175 printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n"); 1175 printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");
1176 1176
1177 retval = pci_module_init(&mm_pci_driver); 1177 retval = pci_register_driver(&mm_pci_driver);
1178 if (retval) 1178 if (retval)
1179 return -ENOMEM; 1179 return -ENOMEM;
1180 1180