Skip to contentSkip to conversation

drivers/block/*: convert to pci_register_driver

PATCH In review [email protected] 3 participants 3 messages Mar 5, 2005 Block layer

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 14/15 drivers/block/*: convert to pci_register_driver

convert from pci_module_init to pci_register_driver

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

---

 kj-domen/drivers/block/DAC960.c |    2 +-
 kj-domen/drivers/block/cciss.c  |    2 +-
 kj-domen/drivers/block/sx8.c    |    2 +-
 kj-domen/drivers/block/umem.c   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/block/DAC960.c renamed from drivers/block/DAC960.c~pci_register_driver-drivers_block +1 -1
diff -puN drivers/block/DAC960.c~pci_register_driver-drivers_block drivers/block/DAC960.c
@@ -7067,7 +7067,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();
drivers/block/cciss.c renamed from drivers/block/cciss.c~pci_register_driver-drivers_block +1 -1
diff -puN drivers/block/cciss.c~pci_register_driver-drivers_block drivers/block/cciss.c
@@ -2880,7 +2880,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)
drivers/block/sx8.c renamed from drivers/block/sx8.c~pci_register_driver-drivers_block +1 -1
diff -puN drivers/block/sx8.c~pci_register_driver-drivers_block drivers/block/sx8.c
@@ -1750,7 +1750,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)
drivers/block/umem.c renamed from drivers/block/umem.c~pci_register_driver-drivers_block +1 -1
diff -puN drivers/block/umem.c~pci_register_driver-drivers_block drivers/block/umem.c
@@ -1185,7 +1185,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;

_

#1 lore raw
Quoted 5 lines · On Sat, Mar 05, 2005 at 11:43:27PM +0100, [email protected] wrote:

convert from pci_module_init to pci_register_driver

Signed-off-by Christophe Lucas <[email protected]>
Signed-off-by Domen Puncer <[email protected]>
Quoted 7 lines

---

 kj-domen/drivers/block/DAC960.c |    2 +-
 kj-domen/drivers/block/cciss.c  |    2 +-
 kj-domen/drivers/block/sx8.c    |    2 +-
 kj-domen/drivers/block/umem.c   |    2 +-

I ACK the sx8 portion.

Please CC me (the maintainer) on all sx8 patches.

Jeff

#2 lore raw
In reply to [email protected]

[email protected] <[email protected]> :
[...]

drivers/block/umem.c int __init mm_init(void) · line 1190

Quoted 11 lines

diff -puN drivers/block/umem.c~pci_register_driver-drivers_block drivers/block/umem.c

drivers/block/umem.c renamed from drivers/block/umem.c~pci_register_driver-drivers_block +1 -1
@@ -1185,7 +1185,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;

The return code is fine and does not need to be overwritten. Imho it could be considered to be part of the patch.

--
Ueimor