From ed5f9155a80ccfac36fad06d17823fd38ff0796c Mon Sep 17 00:00:00 2001 From: Antonino Daplas Date: Wed, 30 Mar 2005 16:45:59 -0800 Subject: [PATCH] fbdev: Convert drivers to pci_register_driver convert from pci_module_init to pci_register_driver (from:http://kerneljanitors.org/TODO). Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/asiliantfb.c | 2 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/aty/atyfb_base.c | 2 +- drivers/video/aty/radeon_base.c | 2 +- drivers/video/chipsfb.c | 2 +- drivers/video/cirrusfb.c | 2 +- drivers/video/console/sticore.c | 2 +- drivers/video/cyber2000fb.c | 2 +- drivers/video/imsttfb.c | 2 +- drivers/video/intelfb/intelfbdrv.c | 2 +- drivers/video/kyro/fbdev.c | 2 +- drivers/video/pm2fb.c | 2 +- drivers/video/pvr2fb.c | 2 +- drivers/video/radeonfb.c | 2 +- drivers/video/sstfb.c | 2 +- drivers/video/tdfxfb.c | 2 +- drivers/video/tgafb.c | 2 +- drivers/video/tridentfb.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c index ed87832d789c4..f4729f4df8cec 100644 --- a/drivers/video/asiliantfb.c +++ b/drivers/video/asiliantfb.c @@ -604,7 +604,7 @@ static int __init asiliantfb_init(void) if (fb_get_options("asiliantfb", NULL)) return -ENODEV; - return pci_module_init(&asiliantfb_driver); + return pci_register_driver(&asiliantfb_driver); } module_init(asiliantfb_init); diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 7b090b23bfffd..8a4ba3bb98728 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c @@ -2461,7 +2461,7 @@ static int __init aty128fb_init(void) aty128fb_setup(option); #endif - return pci_module_init(&aty128fb_driver); + return pci_register_driver(&aty128fb_driver); } static void __exit aty128fb_exit(void) diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 944d2d9912e47..dbe4bf3d4e863 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -3681,7 +3681,7 @@ static int __init atyfb_init(void) #endif #ifdef CONFIG_PCI - pci_module_init(&atyfb_driver); + pci_register_driver(&atyfb_driver); #endif #ifdef CONFIG_ATARI atyfb_atari_probe(); diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 635db904cbe59..a73b566aafb74 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c @@ -2551,7 +2551,7 @@ static int __init radeonfb_init (void) return -ENODEV; radeonfb_setup(option); #endif - return pci_module_init (&radeonfb_driver); + return pci_register_driver (&radeonfb_driver); } diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c index a51f4d2b69d8b..ab98f225fe3ee 100644 --- a/drivers/video/chipsfb.c +++ b/drivers/video/chipsfb.c @@ -465,7 +465,7 @@ int __init chips_init(void) if (fb_get_options("chipsfb", NULL)) return -ENODEV; - return pci_module_init(&chipsfb_driver); + return pci_register_driver(&chipsfb_driver); } module_init(chips_init); diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 0255c61df6207..a3040429c27b7 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c @@ -2623,7 +2623,7 @@ static int __init cirrusfb_init(void) error |= zorro_module_init(&cirrusfb_zorro_driver); #endif #ifdef CONFIG_PCI - error |= pci_module_init(&cirrusfb_pci_driver); + error |= pci_register_driver(&cirrusfb_pci_driver); #endif return error; } diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 1c5961ce00517..2a4efee12a81f 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -1058,7 +1058,7 @@ static void __init sti_init_roms(void) /* Register drivers for native & PCI cards */ register_parisc_driver(&pa_sti_driver); - pci_module_init(&pci_sti_driver); + pci_register_driver(&pci_sti_driver); /* if we didn't find the given default sti, take the first one */ if (!default_sti) diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index de51017107179..8b1b7c687a991 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c @@ -1740,7 +1740,7 @@ static int __init cyber2000fb_init(void) } #endif #ifdef CONFIG_PCI - err = pci_module_init(&cyberpro_driver); + err = pci_register_driver(&cyberpro_driver); if (!err) ret = 0; #endif diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index c1c9e073a12fd..5a72ca3c01385 100644 --- a/drivers/video/imsttfb.c +++ b/drivers/video/imsttfb.c @@ -1611,7 +1611,7 @@ static int __init imsttfb_init(void) imsttfb_setup(option); #endif - return pci_module_init(&imsttfb_pci_driver); + return pci_register_driver(&imsttfb_pci_driver); } static void __exit imsttfb_exit(void) diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 75a874ce37b18..6a05b70008301 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c @@ -360,7 +360,7 @@ intelfb_init(void) intelfb_setup(option); #endif - return pci_module_init(&intelfb_driver); + return pci_register_driver(&intelfb_driver); } static void __exit diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c index 67f4deaa6a454..d8bac9e978421 100644 --- a/drivers/video/kyro/fbdev.c +++ b/drivers/video/kyro/fbdev.c @@ -802,7 +802,7 @@ static int __init kyrofb_init(void) return -ENODEV; kyrofb_setup(option); #endif - return pci_module_init(&kyrofb_pci_driver); + return pci_register_driver(&kyrofb_pci_driver); } static void __exit kyrofb_exit(void) diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 3fb987883b037..5dceddedf5075 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -1282,7 +1282,7 @@ static int __init pm2fb_init(void) pm2fb_setup(option); #endif - return pci_module_init(&pm2fb_driver); + return pci_register_driver(&pm2fb_driver); } module_init(pm2fb_init); diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c index 6741b522c0d36..31c547fd383bf 100644 --- a/drivers/video/pvr2fb.c +++ b/drivers/video/pvr2fb.c @@ -967,7 +967,7 @@ static struct pci_driver pvr2fb_pci_driver = { static int __init pvr2fb_pci_init(void) { - return pci_module_init(&pvr2fb_pci_driver); + return pci_register_driver(&pvr2fb_pci_driver); } static void pvr2fb_pci_exit(void) diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c index 3fad3f70b9d3d..d9a084e77a632 100644 --- a/drivers/video/radeonfb.c +++ b/drivers/video/radeonfb.c @@ -3150,7 +3150,7 @@ static int __init radeonfb_old_init (void) return -ENODEV; radeonfb_old_setup(option); #endif - return pci_module_init (&radeonfb_driver); + return pci_register_driver (&radeonfb_driver); } diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index aa45515223587..663d53657fa4c 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c @@ -1575,7 +1575,7 @@ static int __devinit sstfb_init(void) return -ENODEV; sstfb_setup(option); #endif - return pci_module_init(&sstfb_driver); + return pci_register_driver(&sstfb_driver); } #ifdef MODULE diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index ded8cc87dfc43..c34ba39b6f7e7 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c @@ -1350,7 +1350,7 @@ static int __init tdfxfb_init(void) tdfxfb_setup(option); #endif - return pci_module_init(&tdfxfb_driver); + return pci_register_driver(&tdfxfb_driver); } static void __exit tdfxfb_exit(void) diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c index 075c66de9af0e..3099630d0c3d0 100644 --- a/drivers/video/tgafb.c +++ b/drivers/video/tgafb.c @@ -1540,7 +1540,7 @@ tgafb_init(void) return -ENODEV; tgafb_setup(option); #endif - return pci_module_init(&tgafb_driver); + return pci_register_driver(&tgafb_driver); } /* diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c index 2ad715a6cb2ca..61b994d9a0d65 100644 --- a/drivers/video/tridentfb.c +++ b/drivers/video/tridentfb.c @@ -1264,7 +1264,7 @@ static int __init tridentfb_init(void) tridentfb_setup(option); #endif output("Trident framebuffer %s initializing\n", VERSION); - return pci_module_init(&tridentfb_pci_driver); + return pci_register_driver(&tridentfb_pci_driver); } static void __exit tridentfb_exit(void) -- cgit 1.2.3-korg