pci_register_driver() for drivers/block

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/block/cciss.c linux-2.6.11-rc2/drivers/block/cciss.c
@@ -2883,7 +2883,7 @@ int __init cciss_init(void)
 	printk(KERN_INFO DRIVER_NAME "\n");
 
 	/* Register for our PCI devices */
-	return pci_module_init(&cciss_pci_driver);
+	return pci_register_driver(&cciss_pci_driver);
 }
 
 static int __init init_cciss_module(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/block/DAC960.c linux-2.6.11-rc2/drivers/block/DAC960.c
@@ -7065,7 +7065,7 @@ static int DAC960_init_module(void)
 {
 	int ret;
 
-	ret =  pci_module_init(&DAC960_pci_driver);
+	ret =  pci_register_driver(&DAC960_pci_driver);
 #ifdef DAC960_GAM_MINOR
 	if (!ret)
 		DAC960_gam_init();

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/block/sx8.c linux-2.6.11-rc2/drivers/block/sx8.c
@@ -1749,7 +1749,7 @@ static void carm_remove_one (struct pci_
 
 static int __init carm_init(void)
 {
-	return pci_module_init(&carm_driver);
+	return pci_register_driver(&carm_driver);
 }
 
 static void __exit carm_exit(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/block/umem.c linux-2.6.11-rc2/drivers/block/umem.c
@@ -1188,7 +1188,7 @@ int __init mm_init(void)
 
 	printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");
 
-	retval = pci_module_init(&mm_pci_driver);
+	retval = pci_register_driver(&mm_pci_driver);
 	if (retval)
 		return -ENOMEM;
 

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/ali-agp.c linux-2.6.11-rc2/drivers/char/agp/ali-agp.c
@@ -398,7 +398,7 @@ static int __init agp_ali_init(void)
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_ali_pci_driver);
+	return pci_register_driver(&agp_ali_pci_driver);
 }
 
 static void __exit agp_ali_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/amd64-agp.c linux-2.6.11-rc2/drivers/char/agp/amd64-agp.c
@@ -709,7 +709,7 @@ int __init agp_amd64_init(void)
 
 	if (agp_off)
 		return -EINVAL;
-	if (pci_module_init(&agp_amd64_pci_driver) > 0) {
+	if (pci_register_driver(&agp_amd64_pci_driver) > 0) {
 		struct pci_dev *dev;
 		if (!agp_try_unsupported && !agp_try_unsupported_boot) {
 			printk(KERN_INFO PFX "No supported AGP bridge found.\n");

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/amd-k7-agp.c linux-2.6.11-rc2/drivers/char/agp/amd-k7-agp.c
@@ -480,7 +480,7 @@ static int __init agp_amdk7_init(void)
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_amdk7_pci_driver);
+	return pci_register_driver(&agp_amdk7_pci_driver);
 }
 
 static void __exit agp_amdk7_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/ati-agp.c linux-2.6.11-rc2/drivers/char/agp/ati-agp.c
@@ -531,7 +531,7 @@ static int __init agp_ati_init(void)
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_ati_pci_driver);
+	return pci_register_driver(&agp_ati_pci_driver);
 }
 
 static void __exit agp_ati_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/efficeon-agp.c linux-2.6.11-rc2/drivers/char/agp/efficeon-agp.c
@@ -448,7 +448,7 @@ static int __init agp_efficeon_init(void
 		return 0;
 	agp_initialised=1;
 
-	return pci_module_init(&agp_efficeon_pci_driver);
+	return pci_register_driver(&agp_efficeon_pci_driver);
 }
 
 static void __exit agp_efficeon_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/i460-agp.c linux-2.6.11-rc2/drivers/char/agp/i460-agp.c
@@ -624,7 +624,7 @@ static int __init agp_intel_i460_init(vo
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_intel_i460_pci_driver);
+	return pci_register_driver(&agp_intel_i460_pci_driver);
 }
 
 static void __exit agp_intel_i460_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/intel-agp.c linux-2.6.11-rc2/drivers/char/agp/intel-agp.c
@@ -1806,7 +1806,7 @@ static struct pci_driver agp_intel_pci_d
 
 static int __init agp_intel_init(void)
 {
-	return pci_module_init(&agp_intel_pci_driver);
+	return pci_register_driver(&agp_intel_pci_driver);
 }
 
 static void __exit agp_intel_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/intel-mch-agp.c linux-2.6.11-rc2/drivers/char/agp/intel-mch-agp.c
@@ -627,7 +627,7 @@ int __init agp_intelmch_init(void)
 		return 0;
 	agp_initialised=1;
 
-	return pci_module_init(&agp_intelmch_pci_driver);
+	return pci_register_driver(&agp_intelmch_pci_driver);
 }
 
 static void __exit agp_intelmch_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/nvidia-agp.c linux-2.6.11-rc2/drivers/char/agp/nvidia-agp.c
@@ -407,7 +407,7 @@ static int __init agp_nvidia_init(void)
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_nvidia_pci_driver);
+	return pci_register_driver(&agp_nvidia_pci_driver);
 }
 
 static void __exit agp_nvidia_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/sis-agp.c linux-2.6.11-rc2/drivers/char/agp/sis-agp.c
@@ -342,7 +342,7 @@ static int __init agp_sis_init(void)
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_sis_pci_driver);
+	return pci_register_driver(&agp_sis_pci_driver);
 }
 
 static void __exit agp_sis_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/sworks-agp.c linux-2.6.11-rc2/drivers/char/agp/sworks-agp.c
@@ -541,7 +541,7 @@ static int __init agp_serverworks_init(v
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_serverworks_pci_driver);
+	return pci_register_driver(&agp_serverworks_pci_driver);
 }
 
 static void __exit agp_serverworks_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/uninorth-agp.c linux-2.6.11-rc2/drivers/char/agp/uninorth-agp.c
@@ -375,7 +375,7 @@ static int __init agp_uninorth_init(void
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_uninorth_pci_driver);
+	return pci_register_driver(&agp_uninorth_pci_driver);
 }
 
 static void __exit agp_uninorth_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/char/agp/via-agp.c linux-2.6.11-rc2/drivers/char/agp/via-agp.c
@@ -525,7 +525,7 @@ static int __init agp_via_init(void)
 {
 	if (agp_off)
 		return -EINVAL;
-	return pci_module_init(&agp_via_pci_driver);
+	return pci_register_driver(&agp_via_pci_driver);
 }
 
 static void __exit agp_via_cleanup(void)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/media/common/saa7146_core.c linux-2.6.11-rc2/drivers/media/common/saa7146_core.c
@@ -539,7 +539,7 @@ int saa7146_register_extension(struct sa
 	ext->driver.remove = saa7146_remove_one;
 
 	printk("saa7146: register extension '%s'.\n",ext->name);
-	return pci_module_init(&ext->driver);
+	return pci_register_driver(&ext->driver);
 }
 
 int saa7146_unregister_extension(struct saa7146_extension* ext)

diff -urpN -X /work/users/dontdiff linux-2.6.11-rc2-vanilla/drivers/media/dvb/b2c2/skystar2.c linux-2.6.11-rc2/drivers/media/dvb/b2c2/skystar2.c
@@ -2599,7 +2599,7 @@ static struct pci_driver skystar2_pci_dr
 
 static int skystar2_init(void)
 {
-	return pci_module_init(&skystar2_pci_driver);
+	return pci_register_driver(&skystar2_pci_driver);
 }
 
 static void skystar2_cleanup(void)