diff options
author | Otavio Salvador <otavio@debian.org> | 2006-01-09 12:25:17 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:17 -0500 |
commit | 2304759d7e5debbd400eca6e9bb979a186c798a9 (patch) | |
tree | 502bbd6f17154972b5c11662a6cd132eab35eb80 /drivers/media/video | |
parent | e64a86ee2b5ef5e23ccda2cc8981a22a8111a3b3 (diff) |
V4L/DVB (3110): Replace all uses of pci_module_init with pci_register_driver
This patch replace all calls to pci_module_init, that's deprecated and
will be removed in future, with pci_register_driver that should be
the used function now.
Signed-off-by: Otavio Salvador <otavio@debian.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/bttv-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index 39e9178e599e..b93f4b5c0386 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
@@ -4253,7 +4253,7 @@ static int bttv_init_module(void) | |||
4253 | bttv_check_chipset(); | 4253 | bttv_check_chipset(); |
4254 | 4254 | ||
4255 | bus_register(&bttv_sub_bus_type); | 4255 | bus_register(&bttv_sub_bus_type); |
4256 | return pci_module_init(&bttv_pci_driver); | 4256 | return pci_register_driver(&bttv_pci_driver); |
4257 | } | 4257 | } |
4258 | 4258 | ||
4259 | static void bttv_cleanup_module(void) | 4259 | static void bttv_cleanup_module(void) |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 23d8747338ed..21cb3d6be839 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -1156,7 +1156,7 @@ static int saa7134_init(void) | |||
1156 | printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n", | 1156 | printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n", |
1157 | SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); | 1157 | SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100); |
1158 | #endif | 1158 | #endif |
1159 | return pci_module_init(&saa7134_pci_driver); | 1159 | return pci_register_driver(&saa7134_pci_driver); |
1160 | } | 1160 | } |
1161 | 1161 | ||
1162 | static void saa7134_fini(void) | 1162 | static void saa7134_fini(void) |