From: domen@coderock.org
To: axboe@suse.de
Cc: linux-kernel@vger.kernel.org, domen@coderock.org, c.lucas@ifrance.com
Subject: [patch 14/15] drivers/block/*: convert to pci_register_driver
Date: Sat, 05 Mar 2005 23:43:27 +0100 [thread overview]
Message-ID: <20050305224327.781571F07A@trashy.coderock.org> (raw)
convert from pci_module_init to pci_register_driver
Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
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(-)
diff -puN drivers/block/DAC960.c~pci_register_driver-drivers_block drivers/block/DAC960.c
--- kj/drivers/block/DAC960.c~pci_register_driver-drivers_block 2005-03-05 16:12:15.000000000 +0100
+++ kj-domen/drivers/block/DAC960.c 2005-03-05 16:12:16.000000000 +0100
@@ -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();
diff -puN drivers/block/cciss.c~pci_register_driver-drivers_block drivers/block/cciss.c
--- kj/drivers/block/cciss.c~pci_register_driver-drivers_block 2005-03-05 16:12:15.000000000 +0100
+++ kj-domen/drivers/block/cciss.c 2005-03-05 16:12:16.000000000 +0100
@@ -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)
diff -puN drivers/block/sx8.c~pci_register_driver-drivers_block drivers/block/sx8.c
--- kj/drivers/block/sx8.c~pci_register_driver-drivers_block 2005-03-05 16:12:15.000000000 +0100
+++ kj-domen/drivers/block/sx8.c 2005-03-05 16:12:16.000000000 +0100
@@ -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)
diff -puN drivers/block/umem.c~pci_register_driver-drivers_block drivers/block/umem.c
--- kj/drivers/block/umem.c~pci_register_driver-drivers_block 2005-03-05 16:12:16.000000000 +0100
+++ kj-domen/drivers/block/umem.c 2005-03-05 16:12:16.000000000 +0100
@@ -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;
_
next reply other threads:[~2005-03-05 22:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-05 22:43 domen [this message]
2005-03-05 23:03 ` [patch 14/15] drivers/block/*: convert to pci_register_driver Jeff Garzik
2005-03-05 23:21 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050305224327.781571F07A@trashy.coderock.org \
--to=domen@coderock.org \
--cc=axboe@suse.de \
--cc=c.lucas@ifrance.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox