aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rw-r--r--drivers/media/radio/radio-gemtek-pci.c2
-rw-r--r--drivers/media/radio/radio-maxiradio.c2
-rw-r--r--drivers/media/video/bttv-driver.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c2
8 files changed, 8 insertions, 8 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
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 630cc786d0a4..78b2888bf581 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -394,7 +394,7 @@ static struct pci_driver gemtek_pci_driver =
394 394
395static int __init gemtek_pci_init_module( void ) 395static int __init gemtek_pci_init_module( void )
396{ 396{
397 return pci_module_init( &gemtek_pci_driver ); 397 return pci_register_driver( &gemtek_pci_driver );
398} 398}
399 399
400static void __exit gemtek_pci_cleanup_module( void ) 400static void __exit gemtek_pci_cleanup_module( void )
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 02d39a50d5ed..7b33d8f2f8f8 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -337,7 +337,7 @@ static struct pci_driver maxiradio_driver = {
337 337
338static int __init maxiradio_radio_init(void) 338static int __init maxiradio_radio_init(void)
339{ 339{
340 return pci_module_init(&maxiradio_driver); 340 return pci_register_driver(&maxiradio_driver);
341} 341}
342 342
343static void __exit maxiradio_radio_exit(void) 343static void __exit maxiradio_radio_exit(void)
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 1ddf9ba613ef..00bd8ea5eaeb 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
4259static void bttv_cleanup_module(void) 4259static 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
1162static void saa7134_fini(void) 1162static void saa7134_fini(void)