aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:07:39 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:01 -0500
commit48c68c4f1b542444f175a9e136febcecf3e704d8 (patch)
treed28f4f3b42643990c2908d27e9caf120f6234b73 /drivers/video
parent8590dbc79a0ff5d7ab16b2b1743684c241ae3c65 (diff)
Drivers: video: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/acornfb.c22
-rw-r--r--drivers/video/arcfb.c10
-rw-r--r--drivers/video/arkfb.c10
-rw-r--r--drivers/video/asiliantfb.c18
-rw-r--r--drivers/video/aty/aty128fb.c57
-rw-r--r--drivers/video/aty/atyfb_base.c84
-rw-r--r--drivers/video/aty/mach64_ct.c6
-rw-r--r--drivers/video/aty/mach64_cursor.c2
-rw-r--r--drivers/video/aty/radeon_base.c20
-rw-r--r--drivers/video/aty/radeon_monitor.c24
-rw-r--r--drivers/video/au1100fb.c6
-rw-r--r--drivers/video/au1200fb.c6
-rw-r--r--drivers/video/auo_k1900fb.c6
-rw-r--r--drivers/video/auo_k1901fb.c6
-rw-r--r--drivers/video/auo_k190x.c6
-rw-r--r--drivers/video/bf537-lq035.c18
-rw-r--r--drivers/video/bf54x-lq043fb.c6
-rw-r--r--drivers/video/bfin-lq035q1-fb.c14
-rw-r--r--drivers/video/bfin-t350mcqb-fb.c6
-rw-r--r--drivers/video/bfin_adv7393fb.c10
-rw-r--r--drivers/video/broadsheetfb.c16
-rw-r--r--drivers/video/bw2.c23
-rw-r--r--drivers/video/carminefb.c16
-rw-r--r--drivers/video/cg14.c12
-rw-r--r--drivers/video/cg3.c26
-rw-r--r--drivers/video/cg6.c12
-rw-r--r--drivers/video/chipsfb.c13
-rw-r--r--drivers/video/cirrusfb.c44
-rw-r--r--drivers/video/clps711xfb.c8
-rw-r--r--drivers/video/cobalt_lcdfb.c8
-rw-r--r--drivers/video/console/sticore.c83
-rw-r--r--drivers/video/cyber2000fb.c23
-rw-r--r--drivers/video/da8xx-fb.c10
-rw-r--r--drivers/video/dnfb.c6
-rw-r--r--drivers/video/efifb.c4
-rw-r--r--drivers/video/ep93xx-fb.c8
-rw-r--r--drivers/video/exynos/exynos_dp_core.c6
-rw-r--r--drivers/video/exynos/exynos_mipi_dsi.c4
-rw-r--r--drivers/video/ffb.c6
-rw-r--r--drivers/video/fm2fb.c14
-rw-r--r--drivers/video/fsl-diu-fb.c6
-rw-r--r--drivers/video/gbefb.c24
-rw-r--r--drivers/video/geode/gx1fb_core.c14
-rw-r--r--drivers/video/geode/gxfb_core.c20
-rw-r--r--drivers/video/geode/lxfb_core.c20
-rw-r--r--drivers/video/grvga.c12
-rw-r--r--drivers/video/gxt4500.c13
-rw-r--r--drivers/video/hecubafb.c10
-rw-r--r--drivers/video/hgafb.c12
-rw-r--r--drivers/video/hitfb.c10
-rw-r--r--drivers/video/hpfb.c9
-rw-r--r--drivers/video/i740fb.c15
-rw-r--r--drivers/video/i810/i810_main.c72
-rw-r--r--drivers/video/i810/i810_main.h2
-rw-r--r--drivers/video/igafb.c2
-rw-r--r--drivers/video/imsttfb.c17
-rw-r--r--drivers/video/imxfb.c4
-rw-r--r--drivers/video/intelfb/intelfbdrv.c29
-rw-r--r--drivers/video/jz4740_fb.c8
-rw-r--r--drivers/video/kyro/fbdev.c21
-rw-r--r--drivers/video/leo.c6
-rw-r--r--drivers/video/mb862xx/mb862xxfbdrv.c20
-rw-r--r--drivers/video/mbx/mbxdebugfs.c4
-rw-r--r--drivers/video/mbx/mbxfb.c18
-rw-r--r--drivers/video/metronomefb.c22
-rw-r--r--drivers/video/msm/mddi.c9
-rw-r--r--drivers/video/mxsfb.c12
-rw-r--r--drivers/video/neofb.c26
-rw-r--r--drivers/video/nuc900fb.c4
-rw-r--r--drivers/video/nvidia/nvidia.c49
-rw-r--r--drivers/video/omap/lcd_mipid.c2
-rw-r--r--drivers/video/omap2/displays/panel-acx565akm.c2
-rw-r--r--drivers/video/omap2/displays/panel-lgphilips-lb035q02.c6
-rw-r--r--drivers/video/omap2/displays/panel-n8x0.c2
-rw-r--r--drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c2
-rw-r--r--drivers/video/omap2/displays/panel-tpo-td043mtea1.c4
-rw-r--r--drivers/video/p9100.c6
-rw-r--r--drivers/video/platinumfb.c11
-rw-r--r--drivers/video/pm2fb.c17
-rw-r--r--drivers/video/pm3fb.c17
-rw-r--r--drivers/video/pmag-ba-fb.c6
-rw-r--r--drivers/video/pmagb-b-fb.c12
-rw-r--r--drivers/video/ps3fb.c4
-rw-r--r--drivers/video/pvr2fb.c28
-rw-r--r--drivers/video/pxa168fb.c8
-rw-r--r--drivers/video/pxa3xx-gcu.c8
-rw-r--r--drivers/video/pxafb.c33
-rw-r--r--drivers/video/q40fb.c6
-rw-r--r--drivers/video/riva/fbdev.c45
-rw-r--r--drivers/video/riva/rivafb-i2c.c9
-rw-r--r--drivers/video/s1d13xxxfb.c10
-rw-r--r--drivers/video/s3c-fb.c15
-rw-r--r--drivers/video/s3c2410fb.c16
-rw-r--r--drivers/video/s3fb.c16
-rw-r--r--drivers/video/sa1100fb.c8
-rw-r--r--drivers/video/savage/savagefb_driver.c23
-rw-r--r--drivers/video/sgivwfb.c12
-rw-r--r--drivers/video/sh7760fb.c6
-rw-r--r--drivers/video/sh_mipi_dsi.c4
-rw-r--r--drivers/video/sh_mobile_lcdcfb.c18
-rw-r--r--drivers/video/sh_mobile_meram.c2
-rw-r--r--drivers/video/sis/sis_main.c140
-rw-r--r--drivers/video/sis/sis_main.h20
-rw-r--r--drivers/video/skeletonfb.c17
-rw-r--r--drivers/video/sm501fb.c16
-rw-r--r--drivers/video/ssd1307fb.c11
-rw-r--r--drivers/video/sstfb.c33
-rw-r--r--drivers/video/sunxvr1000.c10
-rw-r--r--drivers/video/sunxvr2500.c12
-rw-r--r--drivers/video/sunxvr500.c12
-rw-r--r--drivers/video/tcx.c6
-rw-r--r--drivers/video/tdfxfb.c30
-rw-r--r--drivers/video/tgafb.c45
-rw-r--r--drivers/video/tmiofb.c8
-rw-r--r--drivers/video/tridentfb.c28
-rw-r--r--drivers/video/uvesafb.c74
-rw-r--r--drivers/video/vermilion/vermilion.c7
-rw-r--r--drivers/video/vfb.c6
-rw-r--r--drivers/video/vga16fb.c10
-rw-r--r--drivers/video/via/dvi.c10
-rw-r--r--drivers/video/via/dvi.h4
-rw-r--r--drivers/video/via/hw.c16
-rw-r--r--drivers/video/via/hw.h4
-rw-r--r--drivers/video/via/lcd.c10
-rw-r--r--drivers/video/via/lcd.h6
-rw-r--r--drivers/video/via/via-core.c19
-rw-r--r--drivers/video/via/via-gpio.c2
-rw-r--r--drivers/video/via/viafbdev.c12
-rw-r--r--drivers/video/vt8500lcdfb.c6
-rw-r--r--drivers/video/vt8623fb.c8
-rw-r--r--drivers/video/w100fb.c10
-rw-r--r--drivers/video/wm8505fb.c6
-rw-r--r--drivers/video/wmt_ge_rops.c6
-rw-r--r--drivers/video/xen-fbfront.c7
-rw-r--r--drivers/video/xilinxfb.c8
135 files changed, 1017 insertions, 1129 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index b303f1715065..6488a7351a60 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -66,7 +66,7 @@
66 * have. Allow 1% either way on the nominal for TVs. 66 * have. Allow 1% either way on the nominal for TVs.
67 */ 67 */
68#define NR_MONTYPES 6 68#define NR_MONTYPES 6
69static struct fb_monspecs monspecs[NR_MONTYPES] __devinitdata = { 69static struct fb_monspecs monspecs[NR_MONTYPES] = {
70 { /* TV */ 70 { /* TV */
71 .hfmin = 15469, 71 .hfmin = 15469,
72 .hfmax = 15781, 72 .hfmax = 15781,
@@ -874,7 +874,7 @@ static struct fb_ops acornfb_ops = {
874/* 874/*
875 * Everything after here is initialisation!!! 875 * Everything after here is initialisation!!!
876 */ 876 */
877static struct fb_videomode modedb[] __devinitdata = { 877static struct fb_videomode modedb[] = {
878 { /* 320x256 @ 50Hz */ 878 { /* 320x256 @ 50Hz */
879 NULL, 50, 320, 256, 125000, 92, 62, 35, 19, 38, 2, 879 NULL, 50, 320, 256, 125000, 92, 62, 35, 19, 38, 2,
880 FB_SYNC_COMP_HIGH_ACT, 880 FB_SYNC_COMP_HIGH_ACT,
@@ -926,7 +926,7 @@ static struct fb_videomode modedb[] __devinitdata = {
926 } 926 }
927}; 927};
928 928
929static struct fb_videomode acornfb_default_mode __devinitdata = { 929static struct fb_videomode acornfb_default_mode = {
930 .name = NULL, 930 .name = NULL,
931 .refresh = 60, 931 .refresh = 60,
932 .xres = 640, 932 .xres = 640,
@@ -942,7 +942,7 @@ static struct fb_videomode acornfb_default_mode __devinitdata = {
942 .vmode = FB_VMODE_NONINTERLACED 942 .vmode = FB_VMODE_NONINTERLACED
943}; 943};
944 944
945static void __devinit acornfb_init_fbinfo(void) 945static void acornfb_init_fbinfo(void)
946{ 946{
947 static int first = 1; 947 static int first = 1;
948 948
@@ -1018,7 +1018,7 @@ static void __devinit acornfb_init_fbinfo(void)
1018 * size can optionally be followed by 'M' or 'K' for 1018 * size can optionally be followed by 'M' or 'K' for
1019 * MB or KB respectively. 1019 * MB or KB respectively.
1020 */ 1020 */
1021static void __devinit acornfb_parse_mon(char *opt) 1021static void acornfb_parse_mon(char *opt)
1022{ 1022{
1023 char *p = opt; 1023 char *p = opt;
1024 1024
@@ -1065,7 +1065,7 @@ bad:
1065 current_par.montype = -1; 1065 current_par.montype = -1;
1066} 1066}
1067 1067
1068static void __devinit acornfb_parse_montype(char *opt) 1068static void acornfb_parse_montype(char *opt)
1069{ 1069{
1070 current_par.montype = -2; 1070 current_par.montype = -2;
1071 1071
@@ -1106,7 +1106,7 @@ static void __devinit acornfb_parse_montype(char *opt)
1106 } 1106 }
1107} 1107}
1108 1108
1109static void __devinit acornfb_parse_dram(char *opt) 1109static void acornfb_parse_dram(char *opt)
1110{ 1110{
1111 unsigned int size; 1111 unsigned int size;
1112 1112
@@ -1131,14 +1131,14 @@ static void __devinit acornfb_parse_dram(char *opt)
1131static struct options { 1131static struct options {
1132 char *name; 1132 char *name;
1133 void (*parse)(char *opt); 1133 void (*parse)(char *opt);
1134} opt_table[] __devinitdata = { 1134} opt_table[] = {
1135 { "mon", acornfb_parse_mon }, 1135 { "mon", acornfb_parse_mon },
1136 { "montype", acornfb_parse_montype }, 1136 { "montype", acornfb_parse_montype },
1137 { "dram", acornfb_parse_dram }, 1137 { "dram", acornfb_parse_dram },
1138 { NULL, NULL } 1138 { NULL, NULL }
1139}; 1139};
1140 1140
1141static int __devinit acornfb_setup(char *options) 1141static int acornfb_setup(char *options)
1142{ 1142{
1143 struct options *optp; 1143 struct options *optp;
1144 char *opt; 1144 char *opt;
@@ -1175,7 +1175,7 @@ static int __devinit acornfb_setup(char *options)
1175 * Detect type of monitor connected 1175 * Detect type of monitor connected
1176 * For now, we just assume SVGA 1176 * For now, we just assume SVGA
1177 */ 1177 */
1178static int __devinit acornfb_detect_monitortype(void) 1178static int acornfb_detect_monitortype(void)
1179{ 1179{
1180 return 4; 1180 return 4;
1181} 1181}
@@ -1216,7 +1216,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
1216 printk("acornfb: freed %dK memory\n", mb_freed); 1216 printk("acornfb: freed %dK memory\n", mb_freed);
1217} 1217}
1218 1218
1219static int __devinit acornfb_probe(struct platform_device *dev) 1219static int acornfb_probe(struct platform_device *dev)
1220{ 1220{
1221 unsigned long size; 1221 unsigned long size;
1222 u_int h_sync, v_sync; 1222 u_int h_sync, v_sync;
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 4659d5da6ff8..e43401afdd03 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -79,7 +79,7 @@ struct arcfb_par {
79 spinlock_t lock; 79 spinlock_t lock;
80}; 80};
81 81
82static struct fb_fix_screeninfo arcfb_fix __devinitdata = { 82static struct fb_fix_screeninfo arcfb_fix = {
83 .id = "arcfb", 83 .id = "arcfb",
84 .type = FB_TYPE_PACKED_PIXELS, 84 .type = FB_TYPE_PACKED_PIXELS,
85 .visual = FB_VISUAL_MONO01, 85 .visual = FB_VISUAL_MONO01,
@@ -89,7 +89,7 @@ static struct fb_fix_screeninfo arcfb_fix __devinitdata = {
89 .accel = FB_ACCEL_NONE, 89 .accel = FB_ACCEL_NONE,
90}; 90};
91 91
92static struct fb_var_screeninfo arcfb_var __devinitdata = { 92static struct fb_var_screeninfo arcfb_var = {
93 .xres = 128, 93 .xres = 128,
94 .yres = 64, 94 .yres = 64,
95 .xres_virtual = 128, 95 .xres_virtual = 128,
@@ -502,7 +502,7 @@ static struct fb_ops arcfb_ops = {
502 .fb_ioctl = arcfb_ioctl, 502 .fb_ioctl = arcfb_ioctl,
503}; 503};
504 504
505static int __devinit arcfb_probe(struct platform_device *dev) 505static int arcfb_probe(struct platform_device *dev)
506{ 506{
507 struct fb_info *info; 507 struct fb_info *info;
508 int retval = -ENOMEM; 508 int retval = -ENOMEM;
@@ -587,7 +587,7 @@ err:
587 return retval; 587 return retval;
588} 588}
589 589
590static int __devexit arcfb_remove(struct platform_device *dev) 590static int arcfb_remove(struct platform_device *dev)
591{ 591{
592 struct fb_info *info = platform_get_drvdata(dev); 592 struct fb_info *info = platform_get_drvdata(dev);
593 593
@@ -601,7 +601,7 @@ static int __devexit arcfb_remove(struct platform_device *dev)
601 601
602static struct platform_driver arcfb_driver = { 602static struct platform_driver arcfb_driver = {
603 .probe = arcfb_probe, 603 .probe = arcfb_probe,
604 .remove = __devexit_p(arcfb_remove), 604 .remove = arcfb_remove,
605 .driver = { 605 .driver = {
606 .name = "arcfb", 606 .name = "arcfb",
607 }, 607 },
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 555dd4c64f5b..94a51f1ef904 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -100,7 +100,7 @@ static const struct svga_timing_regs ark_timing_regs = {
100 100
101/* Module parameters */ 101/* Module parameters */
102 102
103static char *mode_option __devinitdata = "640x480-8@60"; 103static char *mode_option = "640x480-8@60";
104 104
105#ifdef CONFIG_MTRR 105#ifdef CONFIG_MTRR
106static int mtrr = 1; 106static int mtrr = 1;
@@ -950,7 +950,7 @@ static struct fb_ops arkfb_ops = {
950 950
951 951
952/* PCI probe */ 952/* PCI probe */
953static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 953static int ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
954{ 954{
955 struct pci_bus_region bus_reg; 955 struct pci_bus_region bus_reg;
956 struct resource vga_res; 956 struct resource vga_res;
@@ -1086,7 +1086,7 @@ err_enable_device:
1086 1086
1087/* PCI remove */ 1087/* PCI remove */
1088 1088
1089static void __devexit ark_pci_remove(struct pci_dev *dev) 1089static void ark_pci_remove(struct pci_dev *dev)
1090{ 1090{
1091 struct fb_info *info = pci_get_drvdata(dev); 1091 struct fb_info *info = pci_get_drvdata(dev);
1092 1092
@@ -1184,7 +1184,7 @@ fail:
1184 1184
1185/* List of boards that we are trying to support */ 1185/* List of boards that we are trying to support */
1186 1186
1187static struct pci_device_id ark_devices[] __devinitdata = { 1187static struct pci_device_id ark_devices[] = {
1188 {PCI_DEVICE(0xEDD8, 0xA099)}, 1188 {PCI_DEVICE(0xEDD8, 0xA099)},
1189 {0, 0, 0, 0, 0, 0, 0} 1189 {0, 0, 0, 0, 0, 0, 0}
1190}; 1190};
@@ -1196,7 +1196,7 @@ static struct pci_driver arkfb_pci_driver = {
1196 .name = "arkfb", 1196 .name = "arkfb",
1197 .id_table = ark_devices, 1197 .id_table = ark_devices,
1198 .probe = ark_pci_probe, 1198 .probe = ark_pci_probe,
1199 .remove = __devexit_p(ark_pci_remove), 1199 .remove = ark_pci_remove,
1200 .suspend = ark_pci_suspend, 1200 .suspend = ark_pci_suspend,
1201 .resume = ark_pci_resume, 1201 .resume = ark_pci_resume,
1202}; 1202};
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 8cdf88e20b4b..d5a37d62847b 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -451,7 +451,7 @@ static struct chips_init_reg chips_init_xr[] =
451 {0xd1, 0x01}, 451 {0xd1, 0x01},
452}; 452};
453 453
454static void __devinit chips_hw_init(struct fb_info *p) 454static void chips_hw_init(struct fb_info *p)
455{ 455{
456 int i; 456 int i;
457 457
@@ -474,7 +474,7 @@ static void __devinit chips_hw_init(struct fb_info *p)
474 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data); 474 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
475} 475}
476 476
477static struct fb_fix_screeninfo asiliantfb_fix __devinitdata = { 477static struct fb_fix_screeninfo asiliantfb_fix = {
478 .id = "Asiliant 69000", 478 .id = "Asiliant 69000",
479 .type = FB_TYPE_PACKED_PIXELS, 479 .type = FB_TYPE_PACKED_PIXELS,
480 .visual = FB_VISUAL_PSEUDOCOLOR, 480 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -483,7 +483,7 @@ static struct fb_fix_screeninfo asiliantfb_fix __devinitdata = {
483 .smem_len = 0x200000, /* 2MB */ 483 .smem_len = 0x200000, /* 2MB */
484}; 484};
485 485
486static struct fb_var_screeninfo asiliantfb_var __devinitdata = { 486static struct fb_var_screeninfo asiliantfb_var = {
487 .xres = 640, 487 .xres = 640,
488 .yres = 480, 488 .yres = 480,
489 .xres_virtual = 640, 489 .xres_virtual = 640,
@@ -504,7 +504,7 @@ static struct fb_var_screeninfo asiliantfb_var __devinitdata = {
504 .vsync_len = 2, 504 .vsync_len = 2,
505}; 505};
506 506
507static int __devinit init_asiliant(struct fb_info *p, unsigned long addr) 507static int init_asiliant(struct fb_info *p, unsigned long addr)
508{ 508{
509 int err; 509 int err;
510 510
@@ -535,8 +535,8 @@ static int __devinit init_asiliant(struct fb_info *p, unsigned long addr)
535 return 0; 535 return 0;
536} 536}
537 537
538static int __devinit 538static int asiliantfb_pci_init(struct pci_dev *dp,
539asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent) 539 const struct pci_device_id *ent)
540{ 540{
541 unsigned long addr, size; 541 unsigned long addr, size;
542 struct fb_info *p; 542 struct fb_info *p;
@@ -581,7 +581,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
581 return 0; 581 return 0;
582} 582}
583 583
584static void __devexit asiliantfb_remove(struct pci_dev *dp) 584static void asiliantfb_remove(struct pci_dev *dp)
585{ 585{
586 struct fb_info *p = pci_get_drvdata(dp); 586 struct fb_info *p = pci_get_drvdata(dp);
587 587
@@ -593,7 +593,7 @@ static void __devexit asiliantfb_remove(struct pci_dev *dp)
593 framebuffer_release(p); 593 framebuffer_release(p);
594} 594}
595 595
596static struct pci_device_id asiliantfb_pci_tbl[] __devinitdata = { 596static struct pci_device_id asiliantfb_pci_tbl[] = {
597 { PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID }, 597 { PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID },
598 { 0 } 598 { 0 }
599}; 599};
@@ -604,7 +604,7 @@ static struct pci_driver asiliantfb_driver = {
604 .name = "asiliantfb", 604 .name = "asiliantfb",
605 .id_table = asiliantfb_pci_tbl, 605 .id_table = asiliantfb_pci_tbl,
606 .probe = asiliantfb_pci_init, 606 .probe = asiliantfb_pci_init,
607 .remove = __devexit_p(asiliantfb_remove), 607 .remove = asiliantfb_remove,
608}; 608};
609 609
610static int __init asiliantfb_init(void) 610static int __init asiliantfb_init(void)
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 0fefa84ed9ae..8c55011313dc 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -98,7 +98,7 @@
98 98
99#ifndef CONFIG_PPC_PMAC 99#ifndef CONFIG_PPC_PMAC
100/* default mode */ 100/* default mode */
101static struct fb_var_screeninfo default_var __devinitdata = { 101static struct fb_var_screeninfo default_var = {
102 /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */ 102 /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
103 640, 480, 640, 480, 0, 0, 8, 0, 103 640, 480, 640, 480, 0, 0, 8, 0,
104 {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0}, 104 {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},
@@ -121,7 +121,7 @@ static struct fb_var_screeninfo default_var = {
121 121
122/* default modedb mode */ 122/* default modedb mode */
123/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */ 123/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
124static struct fb_videomode defaultmode __devinitdata = { 124static struct fb_videomode defaultmode = {
125 .refresh = 60, 125 .refresh = 60,
126 .xres = 640, 126 .xres = 640,
127 .yres = 480, 127 .yres = 480,
@@ -149,7 +149,7 @@ enum {
149}; 149};
150 150
151/* Must match above enum */ 151/* Must match above enum */
152static char * const r128_family[] __devinitconst = { 152static char * const r128_family[] = {
153 "AGP", 153 "AGP",
154 "PCI", 154 "PCI",
155 "PRO AGP", 155 "PRO AGP",
@@ -275,7 +275,7 @@ static struct pci_driver aty128fb_driver = {
275 .name = "aty128fb", 275 .name = "aty128fb",
276 .id_table = aty128_pci_tbl, 276 .id_table = aty128_pci_tbl,
277 .probe = aty128_probe, 277 .probe = aty128_probe,
278 .remove = __devexit_p(aty128_remove), 278 .remove = aty128_remove,
279 .suspend = aty128_pci_suspend, 279 .suspend = aty128_pci_suspend,
280 .resume = aty128_pci_resume, 280 .resume = aty128_pci_resume,
281}; 281};
@@ -333,7 +333,7 @@ static const struct aty128_meminfo sdr_sgram =
333static const struct aty128_meminfo ddr_sgram = 333static const struct aty128_meminfo ddr_sgram =
334 { 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" }; 334 { 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" };
335 335
336static struct fb_fix_screeninfo aty128fb_fix __devinitdata = { 336static struct fb_fix_screeninfo aty128fb_fix = {
337 .id = "ATY Rage128", 337 .id = "ATY Rage128",
338 .type = FB_TYPE_PACKED_PIXELS, 338 .type = FB_TYPE_PACKED_PIXELS,
339 .visual = FB_VISUAL_PSEUDOCOLOR, 339 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -343,24 +343,24 @@ static struct fb_fix_screeninfo aty128fb_fix __devinitdata = {
343 .accel = FB_ACCEL_ATI_RAGE128, 343 .accel = FB_ACCEL_ATI_RAGE128,
344}; 344};
345 345
346static char *mode_option __devinitdata = NULL; 346static char *mode_option = NULL;
347 347
348#ifdef CONFIG_PPC_PMAC 348#ifdef CONFIG_PPC_PMAC
349static int default_vmode __devinitdata = VMODE_1024_768_60; 349static int default_vmode = VMODE_1024_768_60;
350static int default_cmode __devinitdata = CMODE_8; 350static int default_cmode = CMODE_8;
351#endif 351#endif
352 352
353static int default_crt_on __devinitdata = 0; 353static int default_crt_on = 0;
354static int default_lcd_on __devinitdata = 1; 354static int default_lcd_on = 1;
355 355
356#ifdef CONFIG_MTRR 356#ifdef CONFIG_MTRR
357static bool mtrr = true; 357static bool mtrr = true;
358#endif 358#endif
359 359
360#ifdef CONFIG_PMAC_BACKLIGHT 360#ifdef CONFIG_PMAC_BACKLIGHT
361static int backlight __devinitdata = 1; 361static int backlight = 1;
362#else 362#else
363static int backlight __devinitdata = 0; 363static int backlight = 0;
364#endif 364#endif
365 365
366/* PLL constants */ 366/* PLL constants */
@@ -449,10 +449,9 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
449static int aty128_decode_var(struct fb_var_screeninfo *var, 449static int aty128_decode_var(struct fb_var_screeninfo *var,
450 struct aty128fb_par *par); 450 struct aty128fb_par *par);
451#if 0 451#if 0
452static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, 452static void aty128_get_pllinfo(struct aty128fb_par *par, void __iomem *bios);
453 void __iomem *bios); 453static void __iomem *aty128_map_ROM(struct pci_dev *pdev,
454static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev, 454 const struct aty128fb_par *par);
455 const struct aty128fb_par *par);
456#endif 455#endif
457static void aty128_timings(struct aty128fb_par *par); 456static void aty128_timings(struct aty128fb_par *par);
458static void aty128_init_engine(struct aty128fb_par *par); 457static void aty128_init_engine(struct aty128fb_par *par);
@@ -582,7 +581,7 @@ static void aty_pll_writeupdate(const struct aty128fb_par *par)
582 581
583 582
584/* write to the scratch register to test r/w functionality */ 583/* write to the scratch register to test r/w functionality */
585static int __devinit register_test(const struct aty128fb_par *par) 584static int register_test(const struct aty128fb_par *par)
586{ 585{
587 u32 val; 586 u32 val;
588 int flag = 0; 587 int flag = 0;
@@ -781,8 +780,8 @@ static u32 depth_to_dst(u32 depth)
781 780
782 781
783#ifndef __sparc__ 782#ifndef __sparc__
784static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, 783static void __iomem *aty128_map_ROM(const struct aty128fb_par *par,
785 struct pci_dev *dev) 784 struct pci_dev *dev)
786{ 785{
787 u16 dptr; 786 u16 dptr;
788 u8 rom_type; 787 u8 rom_type;
@@ -868,8 +867,8 @@ static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par,
868 return NULL; 867 return NULL;
869} 868}
870 869
871static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, 870static void aty128_get_pllinfo(struct aty128fb_par *par,
872 unsigned char __iomem *bios) 871 unsigned char __iomem *bios)
873{ 872{
874 unsigned int bios_hdr; 873 unsigned int bios_hdr;
875 unsigned int bios_pll; 874 unsigned int bios_pll;
@@ -891,7 +890,7 @@ static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,
891} 890}
892 891
893#ifdef CONFIG_X86 892#ifdef CONFIG_X86
894static void __iomem * __devinit aty128_find_mem_vbios(struct aty128fb_par *par) 893static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)
895{ 894{
896 /* I simplified this code as we used to miss the signatures in 895 /* I simplified this code as we used to miss the signatures in
897 * a lot of case. It's now closer to XFree, we just don't check 896 * a lot of case. It's now closer to XFree, we just don't check
@@ -916,7 +915,7 @@ static void __iomem * __devinit aty128_find_mem_vbios(struct aty128fb_par *par)
916#endif /* ndef(__sparc__) */ 915#endif /* ndef(__sparc__) */
917 916
918/* fill in known card constants if pll_block is not available */ 917/* fill in known card constants if pll_block is not available */
919static void __devinit aty128_timings(struct aty128fb_par *par) 918static void aty128_timings(struct aty128fb_par *par)
920{ 919{
921#ifdef CONFIG_PPC_OF 920#ifdef CONFIG_PPC_OF
922 /* instead of a table lookup, assume OF has properly 921 /* instead of a table lookup, assume OF has properly
@@ -1658,7 +1657,7 @@ static int aty128fb_sync(struct fb_info *info)
1658} 1657}
1659 1658
1660#ifndef MODULE 1659#ifndef MODULE
1661static int __devinit aty128fb_setup(char *options) 1660static int aty128fb_setup(char *options)
1662{ 1661{
1663 char *this_opt; 1662 char *this_opt;
1664 1663
@@ -1888,8 +1887,7 @@ static void aty128_early_resume(void *data)
1888} 1887}
1889#endif /* CONFIG_PPC_PMAC */ 1888#endif /* CONFIG_PPC_PMAC */
1890 1889
1891static int __devinit aty128_init(struct pci_dev *pdev, 1890static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
1892 const struct pci_device_id *ent)
1893{ 1891{
1894 struct fb_info *info = pci_get_drvdata(pdev); 1892 struct fb_info *info = pci_get_drvdata(pdev);
1895 struct aty128fb_par *par = info->par; 1893 struct aty128fb_par *par = info->par;
@@ -2039,8 +2037,7 @@ static int __devinit aty128_init(struct pci_dev *pdev,
2039 2037
2040#ifdef CONFIG_PCI 2038#ifdef CONFIG_PCI
2041/* register a card ++ajoshi */ 2039/* register a card ++ajoshi */
2042static int __devinit aty128_probe(struct pci_dev *pdev, 2040static int aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2043 const struct pci_device_id *ent)
2044{ 2041{
2045 unsigned long fb_addr, reg_addr; 2042 unsigned long fb_addr, reg_addr;
2046 struct aty128fb_par *par; 2043 struct aty128fb_par *par;
@@ -2156,7 +2153,7 @@ err_free_fb:
2156 return -ENODEV; 2153 return -ENODEV;
2157} 2154}
2158 2155
2159static void __devexit aty128_remove(struct pci_dev *pdev) 2156static void aty128_remove(struct pci_dev *pdev)
2160{ 2157{
2161 struct fb_info *info = pci_get_drvdata(pdev); 2158 struct fb_info *info = pci_get_drvdata(pdev);
2162 struct aty128fb_par *par; 2159 struct aty128fb_par *par;
@@ -2558,7 +2555,7 @@ static int aty128_pci_resume(struct pci_dev *pdev)
2558} 2555}
2559 2556
2560 2557
2561static int __devinit aty128fb_init(void) 2558static int aty128fb_init(void)
2562{ 2559{
2563#ifndef MODULE 2560#ifndef MODULE
2564 char *option = NULL; 2561 char *option = NULL;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 868932f904ef..4f27fdc58d84 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -214,7 +214,7 @@ struct pci_mmap_map {
214 unsigned long prot_mask; 214 unsigned long prot_mask;
215}; 215};
216 216
217static struct fb_fix_screeninfo atyfb_fix __devinitdata = { 217static struct fb_fix_screeninfo atyfb_fix = {
218 .id = "ATY Mach64", 218 .id = "ATY Mach64",
219 .type = FB_TYPE_PACKED_PIXELS, 219 .type = FB_TYPE_PACKED_PIXELS,
220 .visual = FB_VISUAL_PSEUDOCOLOR, 220 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -309,18 +309,18 @@ static int vram;
309static int pll; 309static int pll;
310static int mclk; 310static int mclk;
311static int xclk; 311static int xclk;
312static int comp_sync __devinitdata = -1; 312static int comp_sync = -1;
313static char *mode; 313static char *mode;
314 314
315#ifdef CONFIG_PMAC_BACKLIGHT 315#ifdef CONFIG_PMAC_BACKLIGHT
316static int backlight __devinitdata = 1; 316static int backlight = 1;
317#else 317#else
318static int backlight __devinitdata = 0; 318static int backlight = 0;
319#endif 319#endif
320 320
321#ifdef CONFIG_PPC 321#ifdef CONFIG_PPC
322static int default_vmode __devinitdata = VMODE_CHOOSE; 322static int default_vmode = VMODE_CHOOSE;
323static int default_cmode __devinitdata = CMODE_CHOOSE; 323static int default_cmode = CMODE_CHOOSE;
324 324
325module_param_named(vmode, default_vmode, int, 0); 325module_param_named(vmode, default_vmode, int, 0);
326MODULE_PARM_DESC(vmode, "int: video mode for mac"); 326MODULE_PARM_DESC(vmode, "int: video mode for mac");
@@ -329,10 +329,10 @@ MODULE_PARM_DESC(cmode, "int: color mode for mac");
329#endif 329#endif
330 330
331#ifdef CONFIG_ATARI 331#ifdef CONFIG_ATARI
332static unsigned int mach64_count __devinitdata = 0; 332static unsigned int mach64_count = 0;
333static unsigned long phys_vmembase[FB_MAX] __devinitdata = { 0, }; 333static unsigned long phys_vmembase[FB_MAX] = { 0, };
334static unsigned long phys_size[FB_MAX] __devinitdata = { 0, }; 334static unsigned long phys_size[FB_MAX] = { 0, };
335static unsigned long phys_guiregbase[FB_MAX] __devinitdata = { 0, }; 335static unsigned long phys_guiregbase[FB_MAX] = { 0, };
336#endif 336#endif
337 337
338/* top -> down is an evolution of mach64 chipset, any corrections? */ 338/* top -> down is an evolution of mach64 chipset, any corrections? */
@@ -371,7 +371,7 @@ static struct {
371 const char *name; 371 const char *name;
372 int pll, mclk, xclk, ecp_max; 372 int pll, mclk, xclk, ecp_max;
373 u32 features; 373 u32 features;
374} aty_chips[] __devinitdata = { 374} aty_chips[] = {
375#ifdef CONFIG_FB_ATY_GX 375#ifdef CONFIG_FB_ATY_GX
376 /* Mach64 GX */ 376 /* Mach64 GX */
377 { PCI_CHIP_MACH64GX, "ATI888GX00 (Mach64 GX)", 135, 50, 50, 0, ATI_CHIP_88800GX }, 377 { PCI_CHIP_MACH64GX, "ATI888GX00 (Mach64 GX)", 135, 50, 50, 0, ATI_CHIP_88800GX },
@@ -426,7 +426,7 @@ static struct {
426#endif /* CONFIG_FB_ATY_CT */ 426#endif /* CONFIG_FB_ATY_CT */
427}; 427};
428 428
429static int __devinit correct_chipset(struct atyfb_par *par) 429static int correct_chipset(struct atyfb_par *par)
430{ 430{
431 u8 rev; 431 u8 rev;
432 u16 type; 432 u16 type;
@@ -531,34 +531,34 @@ static int __devinit correct_chipset(struct atyfb_par *par)
531 return 0; 531 return 0;
532} 532}
533 533
534static char ram_dram[] __devinitdata = "DRAM"; 534static char ram_dram[] = "DRAM";
535static char ram_resv[] __devinitdata = "RESV"; 535static char ram_resv[] = "RESV";
536#ifdef CONFIG_FB_ATY_GX 536#ifdef CONFIG_FB_ATY_GX
537static char ram_vram[] __devinitdata = "VRAM"; 537static char ram_vram[] = "VRAM";
538#endif /* CONFIG_FB_ATY_GX */ 538#endif /* CONFIG_FB_ATY_GX */
539#ifdef CONFIG_FB_ATY_CT 539#ifdef CONFIG_FB_ATY_CT
540static char ram_edo[] __devinitdata = "EDO"; 540static char ram_edo[] = "EDO";
541static char ram_sdram[] __devinitdata = "SDRAM (1:1)"; 541static char ram_sdram[] = "SDRAM (1:1)";
542static char ram_sgram[] __devinitdata = "SGRAM (1:1)"; 542static char ram_sgram[] = "SGRAM (1:1)";
543static char ram_sdram32[] __devinitdata = "SDRAM (2:1) (32-bit)"; 543static char ram_sdram32[] = "SDRAM (2:1) (32-bit)";
544static char ram_wram[] __devinitdata = "WRAM"; 544static char ram_wram[] = "WRAM";
545static char ram_off[] __devinitdata = "OFF"; 545static char ram_off[] = "OFF";
546#endif /* CONFIG_FB_ATY_CT */ 546#endif /* CONFIG_FB_ATY_CT */
547 547
548 548
549#ifdef CONFIG_FB_ATY_GX 549#ifdef CONFIG_FB_ATY_GX
550static char *aty_gx_ram[8] __devinitdata = { 550static char *aty_gx_ram[8] = {
551 ram_dram, ram_vram, ram_vram, ram_dram, 551 ram_dram, ram_vram, ram_vram, ram_dram,
552 ram_dram, ram_vram, ram_vram, ram_resv 552 ram_dram, ram_vram, ram_vram, ram_resv
553}; 553};
554#endif /* CONFIG_FB_ATY_GX */ 554#endif /* CONFIG_FB_ATY_GX */
555 555
556#ifdef CONFIG_FB_ATY_CT 556#ifdef CONFIG_FB_ATY_CT
557static char *aty_ct_ram[8] __devinitdata = { 557static char *aty_ct_ram[8] = {
558 ram_off, ram_dram, ram_edo, ram_edo, 558 ram_off, ram_dram, ram_edo, ram_edo,
559 ram_sdram, ram_sgram, ram_wram, ram_resv 559 ram_sdram, ram_sgram, ram_wram, ram_resv
560}; 560};
561static char *aty_xl_ram[8] __devinitdata = { 561static char *aty_xl_ram[8] = {
562 ram_off, ram_dram, ram_edo, ram_edo, 562 ram_off, ram_dram, ram_edo, ram_edo,
563 ram_sdram, ram_sgram, ram_sdram32, ram_resv 563 ram_sdram, ram_sgram, ram_sdram32, ram_resv
564}; 564};
@@ -588,7 +588,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var,
588 * Apple monitor sense 588 * Apple monitor sense
589 */ 589 */
590 590
591static int __devinit read_aty_sense(const struct atyfb_par *par) 591static int read_aty_sense(const struct atyfb_par *par)
592{ 592{
593 int sense, i; 593 int sense, i;
594 594
@@ -2273,7 +2273,7 @@ static void aty_bl_exit(struct backlight_device *bd)
2273 2273
2274#endif /* CONFIG_FB_ATY_BACKLIGHT */ 2274#endif /* CONFIG_FB_ATY_BACKLIGHT */
2275 2275
2276static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk) 2276static void aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
2277{ 2277{
2278 const int ragepro_tbl[] = { 2278 const int ragepro_tbl[] = {
2279 44, 50, 55, 66, 75, 80, 100 2279 44, 50, 55, 66, 75, 80, 100
@@ -2307,8 +2307,8 @@ static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
2307static struct fb_info *fb_list = NULL; 2307static struct fb_info *fb_list = NULL;
2308 2308
2309#if defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) 2309#if defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD)
2310static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par, 2310static int atyfb_get_timings_from_lcd(struct atyfb_par *par,
2311 struct fb_var_screeninfo *var) 2311 struct fb_var_screeninfo *var)
2312{ 2312{
2313 int ret = -EINVAL; 2313 int ret = -EINVAL;
2314 2314
@@ -2333,7 +2333,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
2333} 2333}
2334#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */ 2334#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
2335 2335
2336static int __devinit aty_init(struct fb_info *info) 2336static int aty_init(struct fb_info *info)
2337{ 2337{
2338 struct atyfb_par *par = (struct atyfb_par *) info->par; 2338 struct atyfb_par *par = (struct atyfb_par *) info->par;
2339 const char *ramname = NULL, *xtal; 2339 const char *ramname = NULL, *xtal;
@@ -2787,7 +2787,7 @@ aty_init_exit:
2787} 2787}
2788 2788
2789#if defined(CONFIG_ATARI) && !defined(MODULE) 2789#if defined(CONFIG_ATARI) && !defined(MODULE)
2790static int __devinit store_video_par(char *video_str, unsigned char m64_num) 2790static int store_video_par(char *video_str, unsigned char m64_num)
2791{ 2791{
2792 char *p; 2792 char *p;
2793 unsigned long vmembase, size, guiregbase; 2793 unsigned long vmembase, size, guiregbase;
@@ -2961,9 +2961,8 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
2961 2961
2962#ifdef __sparc__ 2962#ifdef __sparc__
2963 2963
2964static int __devinit atyfb_setup_sparc(struct pci_dev *pdev, 2964static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,
2965 struct fb_info *info, 2965 unsigned long addr)
2966 unsigned long addr)
2967{ 2966{
2968 struct atyfb_par *par = info->par; 2967 struct atyfb_par *par = info->par;
2969 struct device_node *dp; 2968 struct device_node *dp;
@@ -3161,7 +3160,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
3161 3160
3162#ifdef __i386__ 3161#ifdef __i386__
3163#ifdef CONFIG_FB_ATY_GENERIC_LCD 3162#ifdef CONFIG_FB_ATY_GENERIC_LCD
3164static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) 3163static void aty_init_lcd(struct atyfb_par *par, u32 bios_base)
3165{ 3164{
3166 u32 driv_inf_tab, sig; 3165 u32 driv_inf_tab, sig;
3167 u16 lcd_ofs; 3166 u16 lcd_ofs;
@@ -3392,7 +3391,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
3392} 3391}
3393#endif /* CONFIG_FB_ATY_GENERIC_LCD */ 3392#endif /* CONFIG_FB_ATY_GENERIC_LCD */
3394 3393
3395static int __devinit init_from_bios(struct atyfb_par *par) 3394static int init_from_bios(struct atyfb_par *par)
3396{ 3395{
3397 u32 bios_base, rom_addr; 3396 u32 bios_base, rom_addr;
3398 int ret; 3397 int ret;
@@ -3445,9 +3444,8 @@ static int __devinit init_from_bios(struct atyfb_par *par)
3445} 3444}
3446#endif /* __i386__ */ 3445#endif /* __i386__ */
3447 3446
3448static int __devinit atyfb_setup_generic(struct pci_dev *pdev, 3447static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info,
3449 struct fb_info *info, 3448 unsigned long addr)
3450 unsigned long addr)
3451{ 3449{
3452 struct atyfb_par *par = info->par; 3450 struct atyfb_par *par = info->par;
3453 u16 tmp; 3451 u16 tmp;
@@ -3525,8 +3523,8 @@ atyfb_setup_generic_fail:
3525 3523
3526#endif /* !__sparc__ */ 3524#endif /* !__sparc__ */
3527 3525
3528static int __devinit atyfb_pci_probe(struct pci_dev *pdev, 3526static int atyfb_pci_probe(struct pci_dev *pdev,
3529 const struct pci_device_id *ent) 3527 const struct pci_device_id *ent)
3530{ 3528{
3531 unsigned long addr, res_start, res_size; 3529 unsigned long addr, res_start, res_size;
3532 struct fb_info *info; 3530 struct fb_info *info;
@@ -3714,7 +3712,7 @@ static int __init atyfb_atari_probe(void)
3714 3712
3715#ifdef CONFIG_PCI 3713#ifdef CONFIG_PCI
3716 3714
3717static void __devexit atyfb_remove(struct fb_info *info) 3715static void atyfb_remove(struct fb_info *info)
3718{ 3716{
3719 struct atyfb_par *par = (struct atyfb_par *) info->par; 3717 struct atyfb_par *par = (struct atyfb_par *) info->par;
3720 3718
@@ -3762,7 +3760,7 @@ static void __devexit atyfb_remove(struct fb_info *info)
3762} 3760}
3763 3761
3764 3762
3765static void __devexit atyfb_pci_remove(struct pci_dev *pdev) 3763static void atyfb_pci_remove(struct pci_dev *pdev)
3766{ 3764{
3767 struct fb_info *info = pci_get_drvdata(pdev); 3765 struct fb_info *info = pci_get_drvdata(pdev);
3768 3766
@@ -3834,7 +3832,7 @@ static struct pci_driver atyfb_driver = {
3834 .name = "atyfb", 3832 .name = "atyfb",
3835 .id_table = atyfb_pci_tbl, 3833 .id_table = atyfb_pci_tbl,
3836 .probe = atyfb_pci_probe, 3834 .probe = atyfb_pci_probe,
3837 .remove = __devexit_p(atyfb_pci_remove), 3835 .remove = atyfb_pci_remove,
3838#ifdef CONFIG_PM 3836#ifdef CONFIG_PM
3839 .suspend = atyfb_pci_suspend, 3837 .suspend = atyfb_pci_suspend,
3840 .resume = atyfb_pci_resume, 3838 .resume = atyfb_pci_resume,
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index 2745b8539485..51f29d627ceb 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -373,8 +373,7 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)
373#endif 373#endif
374} 374}
375 375
376static void __devinit aty_get_pll_ct(const struct fb_info *info, 376static void aty_get_pll_ct(const struct fb_info *info, union aty_pll *pll)
377 union aty_pll *pll)
378{ 377{
379 struct atyfb_par *par = (struct atyfb_par *) info->par; 378 struct atyfb_par *par = (struct atyfb_par *) info->par;
380 u8 tmp, clock; 379 u8 tmp, clock;
@@ -397,8 +396,7 @@ static void __devinit aty_get_pll_ct(const struct fb_info *info,
397 } 396 }
398} 397}
399 398
400static int __devinit aty_init_pll_ct(const struct fb_info *info, 399static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
401 union aty_pll *pll)
402{ 400{
403 struct atyfb_par *par = (struct atyfb_par *) info->par; 401 struct atyfb_par *par = (struct atyfb_par *) info->par;
404 u8 mpost_div, xpost_div, sclk_post_div_real; 402 u8 mpost_div, xpost_div, sclk_post_div_real;
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index 46f72ed53510..95ec042ddbf8 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -183,7 +183,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
183 return 0; 183 return 0;
184} 184}
185 185
186int __devinit aty_init_cursor(struct fb_info *info) 186int aty_init_cursor(struct fb_info *info)
187{ 187{
188 unsigned long addr; 188 unsigned long addr;
189 189
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 9e279ee38da8..1e30b2b3e79f 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -293,7 +293,7 @@ static void radeon_unmap_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
293 pci_unmap_rom(dev, rinfo->bios_seg); 293 pci_unmap_rom(dev, rinfo->bios_seg);
294} 294}
295 295
296static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev) 296static int radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
297{ 297{
298 void __iomem *rom; 298 void __iomem *rom;
299 u16 dptr; 299 u16 dptr;
@@ -388,7 +388,7 @@ static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev
388} 388}
389 389
390#ifdef CONFIG_X86 390#ifdef CONFIG_X86
391static int __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo) 391static int radeon_find_mem_vbios(struct radeonfb_info *rinfo)
392{ 392{
393 /* I simplified this code as we used to miss the signatures in 393 /* I simplified this code as we used to miss the signatures in
394 * a lot of case. It's now closer to XFree, we just don't check 394 * a lot of case. It's now closer to XFree, we just don't check
@@ -423,7 +423,7 @@ static int __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo)
423 * Read XTAL (ref clock), SCLK and MCLK from Open Firmware device 423 * Read XTAL (ref clock), SCLK and MCLK from Open Firmware device
424 * tree. Hopefully, ATI OF driver is kind enough to fill these 424 * tree. Hopefully, ATI OF driver is kind enough to fill these
425 */ 425 */
426static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) 426static int radeon_read_xtal_OF(struct radeonfb_info *rinfo)
427{ 427{
428 struct device_node *dp = rinfo->of_node; 428 struct device_node *dp = rinfo->of_node;
429 const u32 *val; 429 const u32 *val;
@@ -453,7 +453,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
453/* 453/*
454 * Read PLL infos from chip registers 454 * Read PLL infos from chip registers
455 */ 455 */
456static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo) 456static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
457{ 457{
458 unsigned char ppll_div_sel; 458 unsigned char ppll_div_sel;
459 unsigned Ns, Nm, M; 459 unsigned Ns, Nm, M;
@@ -591,7 +591,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
591/* 591/*
592 * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...) 592 * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...)
593 */ 593 */
594static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) 594static void radeon_get_pllinfo(struct radeonfb_info *rinfo)
595{ 595{
596 /* 596 /*
597 * In the case nothing works, these are defaults; they are mostly 597 * In the case nothing works, these are defaults; they are mostly
@@ -1868,7 +1868,7 @@ static struct fb_ops radeonfb_ops = {
1868}; 1868};
1869 1869
1870 1870
1871static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) 1871static int radeon_set_fbinfo(struct radeonfb_info *rinfo)
1872{ 1872{
1873 struct fb_info *info = rinfo->info; 1873 struct fb_info *info = rinfo->info;
1874 1874
@@ -2143,8 +2143,8 @@ static struct bin_attribute edid2_attr = {
2143}; 2143};
2144 2144
2145 2145
2146static int __devinit radeonfb_pci_register (struct pci_dev *pdev, 2146static int radeonfb_pci_register(struct pci_dev *pdev,
2147 const struct pci_device_id *ent) 2147 const struct pci_device_id *ent)
2148{ 2148{
2149 struct fb_info *info; 2149 struct fb_info *info;
2150 struct radeonfb_info *rinfo; 2150 struct radeonfb_info *rinfo;
@@ -2407,7 +2407,7 @@ err_out:
2407 2407
2408 2408
2409 2409
2410static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev) 2410static void radeonfb_pci_unregister(struct pci_dev *pdev)
2411{ 2411{
2412 struct fb_info *info = pci_get_drvdata(pdev); 2412 struct fb_info *info = pci_get_drvdata(pdev);
2413 struct radeonfb_info *rinfo = info->par; 2413 struct radeonfb_info *rinfo = info->par;
@@ -2465,7 +2465,7 @@ static struct pci_driver radeonfb_driver = {
2465 .name = "radeonfb", 2465 .name = "radeonfb",
2466 .id_table = radeonfb_pci_table, 2466 .id_table = radeonfb_pci_table,
2467 .probe = radeonfb_pci_register, 2467 .probe = radeonfb_pci_register,
2468 .remove = __devexit_p(radeonfb_pci_unregister), 2468 .remove = radeonfb_pci_unregister,
2469#ifdef CONFIG_PM 2469#ifdef CONFIG_PM
2470 .suspend = radeonfb_pci_suspend, 2470 .suspend = radeonfb_pci_suspend,
2471 .resume = radeonfb_pci_resume, 2471 .resume = radeonfb_pci_resume,
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 5c23eac0eb9a..bc078d50d8f1 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -62,8 +62,8 @@ static char *radeon_get_mon_name(int type)
62 * models with broken OF probing by hard-coding known EDIDs for some Mac 62 * models with broken OF probing by hard-coding known EDIDs for some Mac
63 * laptops internal LVDS panel. (XXX: not done yet) 63 * laptops internal LVDS panel. (XXX: not done yet)
64 */ 64 */
65static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_EDID, 65static int radeon_parse_montype_prop(struct device_node *dp, u8 **out_EDID,
66 int hdno) 66 int hdno)
67{ 67{
68 static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID", 68 static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
69 "EDID1", "EDID2", NULL }; 69 "EDID1", "EDID2", NULL };
@@ -115,8 +115,8 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
115 return mt; 115 return mt;
116} 116}
117 117
118static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no, 118static int radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no,
119 u8 **out_EDID) 119 u8 **out_EDID)
120{ 120{
121 struct device_node *dp; 121 struct device_node *dp;
122 122
@@ -163,7 +163,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
163#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ 163#endif /* CONFIG_PPC_OF || CONFIG_SPARC */
164 164
165 165
166static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo) 166static int radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
167{ 167{
168 unsigned long tmp, tmp0; 168 unsigned long tmp, tmp0;
169 char stmp[30]; 169 char stmp[30];
@@ -251,7 +251,7 @@ static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
251 * doesn't quite work yet, but it's output is still useful for 251 * doesn't quite work yet, but it's output is still useful for
252 * debugging 252 * debugging
253 */ 253 */
254static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo) 254static void radeon_parse_connector_info(struct radeonfb_info *rinfo)
255{ 255{
256 int offset, chips, connectors, tmp, i, conn, type; 256 int offset, chips, connectors, tmp, i, conn, type;
257 257
@@ -297,7 +297,7 @@ static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo)
297 * as well and currently is only implemented for the CRT DAC, the 297 * as well and currently is only implemented for the CRT DAC, the
298 * code for the TVDAC is commented out in XFree as "non working" 298 * code for the TVDAC is commented out in XFree as "non working"
299 */ 299 */
300static int __devinit radeon_crt_is_connected(struct radeonfb_info *rinfo, int is_crt_dac) 300static int radeon_crt_is_connected(struct radeonfb_info *rinfo, int is_crt_dac)
301{ 301{
302 int connected = 0; 302 int connected = 0;
303 303
@@ -369,8 +369,8 @@ static int __devinit radeon_crt_is_connected(struct radeonfb_info *rinfo, int is
369 * Parse the "monitor_layout" string if any. This code is mostly 369 * Parse the "monitor_layout" string if any. This code is mostly
370 * copied from XFree's radeon driver 370 * copied from XFree's radeon driver
371 */ 371 */
372static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo, 372static int radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
373 const char *monitor_layout) 373 const char *monitor_layout)
374{ 374{
375 char s1[5], s2[5]; 375 char s1[5], s2[5];
376 int i = 0, second = 0; 376 int i = 0, second = 0;
@@ -433,8 +433,8 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
433 * try to retrieve EDID. The algorithm here comes from XFree's radeon 433 * try to retrieve EDID. The algorithm here comes from XFree's radeon
434 * driver 434 * driver
435 */ 435 */
436void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, 436void radeon_probe_screens(struct radeonfb_info *rinfo,
437 const char *monitor_layout, int ignore_edid) 437 const char *monitor_layout, int ignore_edid)
438{ 438{
439#ifdef CONFIG_FB_RADEON_I2C 439#ifdef CONFIG_FB_RADEON_I2C
440 int ddc_crt2_used = 0; 440 int ddc_crt2_used = 0;
@@ -753,7 +753,7 @@ static int is_powerblade(const char *model)
753 * Build the modedb for head 1 (head 2 will come later), check panel infos 753 * Build the modedb for head 1 (head 2 will come later), check panel infos
754 * from either BIOS or EDID, and pick up the default mode 754 * from either BIOS or EDID, and pick up the default mode
755 */ 755 */
756void __devinit radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_option) 756void radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_option)
757{ 757{
758 struct fb_info * info = rinfo->info; 758 struct fb_info * info = rinfo->info;
759 int has_default_mode = 0; 759 int has_default_mode = 0;
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index fe3b6ec87122..ddabaa867b0d 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -83,7 +83,7 @@ struct fb_bitfield rgb_bitfields[][4] =
83 { { 8, 4, 0 }, { 4, 4, 0 }, { 0, 4, 0 }, { 0, 0, 0 } }, 83 { { 8, 4, 0 }, { 4, 4, 0 }, { 0, 4, 0 }, { 0, 0, 0 } },
84}; 84};
85 85
86static struct fb_fix_screeninfo au1100fb_fix __devinitdata = { 86static struct fb_fix_screeninfo au1100fb_fix = {
87 .id = "AU1100 FB", 87 .id = "AU1100 FB",
88 .xpanstep = 1, 88 .xpanstep = 1,
89 .ypanstep = 1, 89 .ypanstep = 1,
@@ -91,7 +91,7 @@ static struct fb_fix_screeninfo au1100fb_fix __devinitdata = {
91 .accel = FB_ACCEL_NONE, 91 .accel = FB_ACCEL_NONE,
92}; 92};
93 93
94static struct fb_var_screeninfo au1100fb_var __devinitdata = { 94static struct fb_var_screeninfo au1100fb_var = {
95 .activate = FB_ACTIVATE_NOW, 95 .activate = FB_ACTIVATE_NOW,
96 .height = -1, 96 .height = -1,
97 .width = -1, 97 .width = -1,
@@ -469,7 +469,7 @@ static int au1100fb_setup(struct au1100fb_device *fbdev)
469 return 0; 469 return 0;
470} 470}
471 471
472static int __devinit au1100fb_drv_probe(struct platform_device *dev) 472static int au1100fb_drv_probe(struct platform_device *dev)
473{ 473{
474 struct au1100fb_device *fbdev = NULL; 474 struct au1100fb_device *fbdev = NULL;
475 struct resource *regs_res; 475 struct resource *regs_res;
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 7ca79f02056e..1b59054fc6a4 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1673,7 +1673,7 @@ out:
1673} 1673}
1674 1674
1675/* AU1200 LCD controller device driver */ 1675/* AU1200 LCD controller device driver */
1676static int __devinit au1200fb_drv_probe(struct platform_device *dev) 1676static int au1200fb_drv_probe(struct platform_device *dev)
1677{ 1677{
1678 struct au1200fb_device *fbdev; 1678 struct au1200fb_device *fbdev;
1679 struct au1200fb_platdata *pd; 1679 struct au1200fb_platdata *pd;
@@ -1798,7 +1798,7 @@ failed:
1798 return ret; 1798 return ret;
1799} 1799}
1800 1800
1801static int __devexit au1200fb_drv_remove(struct platform_device *dev) 1801static int au1200fb_drv_remove(struct platform_device *dev)
1802{ 1802{
1803 struct au1200fb_platdata *pd = platform_get_drvdata(dev); 1803 struct au1200fb_platdata *pd = platform_get_drvdata(dev);
1804 struct au1200fb_device *fbdev; 1804 struct au1200fb_device *fbdev;
@@ -1876,7 +1876,7 @@ static struct platform_driver au1200fb_driver = {
1876 .pm = AU1200FB_PMOPS, 1876 .pm = AU1200FB_PMOPS,
1877 }, 1877 },
1878 .probe = au1200fb_drv_probe, 1878 .probe = au1200fb_drv_probe,
1879 .remove = __devexit_p(au1200fb_drv_remove), 1879 .remove = au1200fb_drv_remove,
1880}; 1880};
1881 1881
1882/*-------------------------------------------------------------------------*/ 1882/*-------------------------------------------------------------------------*/
diff --git a/drivers/video/auo_k1900fb.c b/drivers/video/auo_k1900fb.c
index c36cf961dcb2..1a9ac6e1f4b3 100644
--- a/drivers/video/auo_k1900fb.c
+++ b/drivers/video/auo_k1900fb.c
@@ -156,7 +156,7 @@ static bool auok1900fb_need_refresh(struct auok190xfb_par *par)
156 return (par->update_cnt > 10); 156 return (par->update_cnt > 10);
157} 157}
158 158
159static int __devinit auok1900fb_probe(struct platform_device *pdev) 159static int auok1900fb_probe(struct platform_device *pdev)
160{ 160{
161 struct auok190x_init_data init; 161 struct auok190x_init_data init;
162 struct auok190x_board *board; 162 struct auok190x_board *board;
@@ -177,14 +177,14 @@ static int __devinit auok1900fb_probe(struct platform_device *pdev)
177 return auok190x_common_probe(pdev, &init); 177 return auok190x_common_probe(pdev, &init);
178} 178}
179 179
180static int __devexit auok1900fb_remove(struct platform_device *pdev) 180static int auok1900fb_remove(struct platform_device *pdev)
181{ 181{
182 return auok190x_common_remove(pdev); 182 return auok190x_common_remove(pdev);
183} 183}
184 184
185static struct platform_driver auok1900fb_driver = { 185static struct platform_driver auok1900fb_driver = {
186 .probe = auok1900fb_probe, 186 .probe = auok1900fb_probe,
187 .remove = __devexit_p(auok1900fb_remove), 187 .remove = auok1900fb_remove,
188 .driver = { 188 .driver = {
189 .owner = THIS_MODULE, 189 .owner = THIS_MODULE,
190 .name = "auo_k1900fb", 190 .name = "auo_k1900fb",
diff --git a/drivers/video/auo_k1901fb.c b/drivers/video/auo_k1901fb.c
index 1c054c18616e..d1db1653cd88 100644
--- a/drivers/video/auo_k1901fb.c
+++ b/drivers/video/auo_k1901fb.c
@@ -209,7 +209,7 @@ static bool auok1901fb_need_refresh(struct auok190xfb_par *par)
209 return (par->update_cnt > 10); 209 return (par->update_cnt > 10);
210} 210}
211 211
212static int __devinit auok1901fb_probe(struct platform_device *pdev) 212static int auok1901fb_probe(struct platform_device *pdev)
213{ 213{
214 struct auok190x_init_data init; 214 struct auok190x_init_data init;
215 struct auok190x_board *board; 215 struct auok190x_board *board;
@@ -230,14 +230,14 @@ static int __devinit auok1901fb_probe(struct platform_device *pdev)
230 return auok190x_common_probe(pdev, &init); 230 return auok190x_common_probe(pdev, &init);
231} 231}
232 232
233static int __devexit auok1901fb_remove(struct platform_device *pdev) 233static int auok1901fb_remove(struct platform_device *pdev)
234{ 234{
235 return auok190x_common_remove(pdev); 235 return auok190x_common_remove(pdev);
236} 236}
237 237
238static struct platform_driver auok1901fb_driver = { 238static struct platform_driver auok1901fb_driver = {
239 .probe = auok1901fb_probe, 239 .probe = auok1901fb_probe,
240 .remove = __devexit_p(auok1901fb_remove), 240 .remove = auok1901fb_remove,
241 .driver = { 241 .driver = {
242 .owner = THIS_MODULE, 242 .owner = THIS_MODULE,
243 .name = "auo_k1901fb", 243 .name = "auo_k1901fb",
diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c
index c03ecdd31e4c..97f79356141e 100644
--- a/drivers/video/auo_k190x.c
+++ b/drivers/video/auo_k190x.c
@@ -773,8 +773,8 @@ EXPORT_SYMBOL_GPL(auok190x_pm);
773 * Common probe and remove code 773 * Common probe and remove code
774 */ 774 */
775 775
776int __devinit auok190x_common_probe(struct platform_device *pdev, 776int auok190x_common_probe(struct platform_device *pdev,
777 struct auok190x_init_data *init) 777 struct auok190x_init_data *init)
778{ 778{
779 struct auok190x_board *board = init->board; 779 struct auok190x_board *board = init->board;
780 struct auok190xfb_par *par; 780 struct auok190xfb_par *par;
@@ -1006,7 +1006,7 @@ err_reg:
1006} 1006}
1007EXPORT_SYMBOL_GPL(auok190x_common_probe); 1007EXPORT_SYMBOL_GPL(auok190x_common_probe);
1008 1008
1009int __devexit auok190x_common_remove(struct platform_device *pdev) 1009int auok190x_common_remove(struct platform_device *pdev)
1010{ 1010{
1011 struct fb_info *info = platform_get_drvdata(pdev); 1011 struct fb_info *info = platform_get_drvdata(pdev);
1012 struct auok190xfb_par *par = info->par; 1012 struct auok190xfb_par *par = info->par;
diff --git a/drivers/video/bf537-lq035.c b/drivers/video/bf537-lq035.c
index 7347aa1e5e4a..a82d2578d976 100644
--- a/drivers/video/bf537-lq035.c
+++ b/drivers/video/bf537-lq035.c
@@ -87,8 +87,8 @@ static void set_vcomm(void)
87 pr_err("i2c_smbus_write_byte_data fail: %d\n", nr); 87 pr_err("i2c_smbus_write_byte_data fail: %d\n", nr);
88} 88}
89 89
90static int __devinit ad5280_probe(struct i2c_client *client, 90static int ad5280_probe(struct i2c_client *client,
91 const struct i2c_device_id *id) 91 const struct i2c_device_id *id)
92{ 92{
93 int ret; 93 int ret;
94 if (!i2c_check_functionality(client->adapter, 94 if (!i2c_check_functionality(client->adapter,
@@ -108,7 +108,7 @@ static int __devinit ad5280_probe(struct i2c_client *client,
108 return 0; 108 return 0;
109} 109}
110 110
111static int __devexit ad5280_remove(struct i2c_client *client) 111static int ad5280_remove(struct i2c_client *client)
112{ 112{
113 ad5280_client = NULL; 113 ad5280_client = NULL;
114 return 0; 114 return 0;
@@ -126,7 +126,7 @@ static struct i2c_driver ad5280_driver = {
126 .name = "bf537-lq035-ad5280", 126 .name = "bf537-lq035-ad5280",
127 }, 127 },
128 .probe = ad5280_probe, 128 .probe = ad5280_probe,
129 .remove = __devexit_p(ad5280_remove), 129 .remove = ad5280_remove,
130 .id_table = ad5280_id, 130 .id_table = ad5280_id,
131}; 131};
132 132
@@ -360,7 +360,7 @@ static int config_dma(void)
360 return 0; 360 return 0;
361} 361}
362 362
363static int __devinit request_ports(void) 363static int request_ports(void)
364{ 364{
365 u16 tmr_req[] = TIMERS; 365 u16 tmr_req[] = TIMERS;
366 366
@@ -443,7 +443,7 @@ static struct fb_var_screeninfo bfin_lq035_fb_defined = {
443 .transp = {0, 0, 0}, 443 .transp = {0, 0, 0},
444}; 444};
445 445
446static struct fb_fix_screeninfo bfin_lq035_fb_fix __devinitdata = { 446static struct fb_fix_screeninfo bfin_lq035_fb_fix = {
447 .id = KBUILD_MODNAME, 447 .id = KBUILD_MODNAME,
448 .smem_len = ACTIVE_VIDEO_MEM_SIZE, 448 .smem_len = ACTIVE_VIDEO_MEM_SIZE,
449 .type = FB_TYPE_PACKED_PIXELS, 449 .type = FB_TYPE_PACKED_PIXELS,
@@ -686,7 +686,7 @@ static struct lcd_ops bfin_lcd_ops = {
686 686
687static struct lcd_device *lcd_dev; 687static struct lcd_device *lcd_dev;
688 688
689static int __devinit bfin_lq035_probe(struct platform_device *pdev) 689static int bfin_lq035_probe(struct platform_device *pdev)
690{ 690{
691 struct backlight_properties props; 691 struct backlight_properties props;
692 dma_addr_t dma_handle; 692 dma_addr_t dma_handle;
@@ -816,7 +816,7 @@ out_ports:
816 return ret; 816 return ret;
817} 817}
818 818
819static int __devexit bfin_lq035_remove(struct platform_device *pdev) 819static int bfin_lq035_remove(struct platform_device *pdev)
820{ 820{
821 if (fb_buffer != NULL) 821 if (fb_buffer != NULL)
822 dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0); 822 dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
@@ -889,7 +889,7 @@ static int bfin_lq035_resume(struct platform_device *pdev)
889 889
890static struct platform_driver bfin_lq035_driver = { 890static struct platform_driver bfin_lq035_driver = {
891 .probe = bfin_lq035_probe, 891 .probe = bfin_lq035_probe,
892 .remove = __devexit_p(bfin_lq035_remove), 892 .remove = bfin_lq035_remove,
893 .suspend = bfin_lq035_suspend, 893 .suspend = bfin_lq035_suspend,
894 .resume = bfin_lq035_resume, 894 .resume = bfin_lq035_resume,
895 .driver = { 895 .driver = {
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index ff5663f5c64f..2726a5b66741 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -497,7 +497,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
497 return IRQ_HANDLED; 497 return IRQ_HANDLED;
498} 498}
499 499
500static int __devinit bfin_bf54x_probe(struct platform_device *pdev) 500static int bfin_bf54x_probe(struct platform_device *pdev)
501{ 501{
502#ifndef NO_BL_SUPPORT 502#ifndef NO_BL_SUPPORT
503 struct backlight_properties props; 503 struct backlight_properties props;
@@ -686,7 +686,7 @@ out1:
686 return ret; 686 return ret;
687} 687}
688 688
689static int __devexit bfin_bf54x_remove(struct platform_device *pdev) 689static int bfin_bf54x_remove(struct platform_device *pdev)
690{ 690{
691 691
692 struct fb_info *fbinfo = platform_get_drvdata(pdev); 692 struct fb_info *fbinfo = platform_get_drvdata(pdev);
@@ -754,7 +754,7 @@ static int bfin_bf54x_resume(struct platform_device *pdev)
754 754
755static struct platform_driver bfin_bf54x_driver = { 755static struct platform_driver bfin_bf54x_driver = {
756 .probe = bfin_bf54x_probe, 756 .probe = bfin_bf54x_probe,
757 .remove = __devexit_p(bfin_bf54x_remove), 757 .remove = bfin_bf54x_remove,
758 .suspend = bfin_bf54x_suspend, 758 .suspend = bfin_bf54x_suspend,
759 .resume = bfin_bf54x_resume, 759 .resume = bfin_bf54x_resume,
760 .driver = { 760 .driver = {
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
index 6fbc75c2f0a1..29d8c0443a1f 100644
--- a/drivers/video/bfin-lq035q1-fb.c
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -137,7 +137,7 @@ static int lq035q1_control(struct spi_device *spi, unsigned char reg, unsigned s
137 return ret; 137 return ret;
138} 138}
139 139
140static int __devinit lq035q1_spidev_probe(struct spi_device *spi) 140static int lq035q1_spidev_probe(struct spi_device *spi)
141{ 141{
142 int ret; 142 int ret;
143 struct spi_control *ctl; 143 struct spi_control *ctl;
@@ -358,8 +358,8 @@ static inline void bfin_lq035q1_free_ports(unsigned ppi16)
358 gpio_free(P_IDENT(P_PPI0_FS3)); 358 gpio_free(P_IDENT(P_PPI0_FS3));
359} 359}
360 360
361static int __devinit bfin_lq035q1_request_ports(struct platform_device *pdev, 361static int bfin_lq035q1_request_ports(struct platform_device *pdev,
362 unsigned ppi16) 362 unsigned ppi16)
363{ 363{
364 int ret; 364 int ret;
365 /* ANOMALY_05000400 - PPI Does Not Start Properly In Specific Mode: 365 /* ANOMALY_05000400 - PPI Does Not Start Properly In Specific Mode:
@@ -555,7 +555,7 @@ static irqreturn_t bfin_lq035q1_irq_error(int irq, void *dev_id)
555 return IRQ_HANDLED; 555 return IRQ_HANDLED;
556} 556}
557 557
558static int __devinit bfin_lq035q1_probe(struct platform_device *pdev) 558static int bfin_lq035q1_probe(struct platform_device *pdev)
559{ 559{
560 struct bfin_lq035q1fb_info *info; 560 struct bfin_lq035q1fb_info *info;
561 struct fb_info *fbinfo; 561 struct fb_info *fbinfo;
@@ -706,7 +706,7 @@ static int __devinit bfin_lq035q1_probe(struct platform_device *pdev)
706 706
707 info->spidrv.driver.name = DRIVER_NAME"-spi"; 707 info->spidrv.driver.name = DRIVER_NAME"-spi";
708 info->spidrv.probe = lq035q1_spidev_probe; 708 info->spidrv.probe = lq035q1_spidev_probe;
709 info->spidrv.remove = __devexit_p(lq035q1_spidev_remove); 709 info->spidrv.remove = lq035q1_spidev_remove;
710 info->spidrv.shutdown = lq035q1_spidev_shutdown; 710 info->spidrv.shutdown = lq035q1_spidev_shutdown;
711 info->spidrv.suspend = lq035q1_spidev_suspend; 711 info->spidrv.suspend = lq035q1_spidev_suspend;
712 info->spidrv.resume = lq035q1_spidev_resume; 712 info->spidrv.resume = lq035q1_spidev_resume;
@@ -764,7 +764,7 @@ static int __devinit bfin_lq035q1_probe(struct platform_device *pdev)
764 return ret; 764 return ret;
765} 765}
766 766
767static int __devexit bfin_lq035q1_remove(struct platform_device *pdev) 767static int bfin_lq035q1_remove(struct platform_device *pdev)
768{ 768{
769 struct fb_info *fbinfo = platform_get_drvdata(pdev); 769 struct fb_info *fbinfo = platform_get_drvdata(pdev);
770 struct bfin_lq035q1fb_info *info = fbinfo->par; 770 struct bfin_lq035q1fb_info *info = fbinfo->par;
@@ -845,7 +845,7 @@ static struct dev_pm_ops bfin_lq035q1_dev_pm_ops = {
845 845
846static struct platform_driver bfin_lq035q1_driver = { 846static struct platform_driver bfin_lq035q1_driver = {
847 .probe = bfin_lq035q1_probe, 847 .probe = bfin_lq035q1_probe,
848 .remove = __devexit_p(bfin_lq035q1_remove), 848 .remove = bfin_lq035q1_remove,
849 .driver = { 849 .driver = {
850 .name = DRIVER_NAME, 850 .name = DRIVER_NAME,
851#ifdef CONFIG_PM 851#ifdef CONFIG_PM
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index ae0fb24b8b43..d46da01c31ae 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -418,7 +418,7 @@ static irqreturn_t bfin_t350mcqb_irq_error(int irq, void *dev_id)
418 return IRQ_HANDLED; 418 return IRQ_HANDLED;
419} 419}
420 420
421static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) 421static int bfin_t350mcqb_probe(struct platform_device *pdev)
422{ 422{
423#ifndef NO_BL_SUPPORT 423#ifndef NO_BL_SUPPORT
424 struct backlight_properties props; 424 struct backlight_properties props;
@@ -583,7 +583,7 @@ out1:
583 return ret; 583 return ret;
584} 584}
585 585
586static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev) 586static int bfin_t350mcqb_remove(struct platform_device *pdev)
587{ 587{
588 588
589 struct fb_info *fbinfo = platform_get_drvdata(pdev); 589 struct fb_info *fbinfo = platform_get_drvdata(pdev);
@@ -658,7 +658,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev)
658 658
659static struct platform_driver bfin_t350mcqb_driver = { 659static struct platform_driver bfin_t350mcqb_driver = {
660 .probe = bfin_t350mcqb_probe, 660 .probe = bfin_t350mcqb_probe,
661 .remove = __devexit_p(bfin_t350mcqb_remove), 661 .remove = bfin_t350mcqb_remove,
662 .suspend = bfin_t350mcqb_suspend, 662 .suspend = bfin_t350mcqb_suspend,
663 .resume = bfin_t350mcqb_resume, 663 .resume = bfin_t350mcqb_resume,
664 .driver = { 664 .driver = {
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index d0f121bd8b25..8d411a3c9966 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -88,7 +88,7 @@ static struct fb_var_screeninfo bfin_adv7393_fb_defined = {
88 .transp = {0, 0, 0}, 88 .transp = {0, 0, 0},
89}; 89};
90 90
91static struct fb_fix_screeninfo bfin_adv7393_fb_fix __devinitdata = { 91static struct fb_fix_screeninfo bfin_adv7393_fb_fix = {
92 .id = "BFIN ADV7393", 92 .id = "BFIN ADV7393",
93 .smem_len = 720 * 480 * 2, 93 .smem_len = 720 * 480 * 2,
94 .type = FB_TYPE_PACKED_PIXELS, 94 .type = FB_TYPE_PACKED_PIXELS,
@@ -368,8 +368,8 @@ adv7393_write_proc(struct file *file, const char __user * buffer,
368 return count; 368 return count;
369} 369}
370 370
371static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client, 371static int bfin_adv7393_fb_probe(struct i2c_client *client,
372 const struct i2c_device_id *id) 372 const struct i2c_device_id *id)
373{ 373{
374 int ret = 0; 374 int ret = 0;
375 struct proc_dir_entry *entry; 375 struct proc_dir_entry *entry;
@@ -719,7 +719,7 @@ static int bfin_adv7393_fb_setcolreg(u_int regno, u_int red, u_int green,
719 return 0; 719 return 0;
720} 720}
721 721
722static int __devexit bfin_adv7393_fb_remove(struct i2c_client *client) 722static int bfin_adv7393_fb_remove(struct i2c_client *client)
723{ 723{
724 struct adv7393fb_device *fbdev = i2c_get_clientdata(client); 724 struct adv7393fb_device *fbdev = i2c_get_clientdata(client);
725 725
@@ -794,7 +794,7 @@ static struct i2c_driver bfin_adv7393_fb_driver = {
794#endif 794#endif
795 }, 795 },
796 .probe = bfin_adv7393_fb_probe, 796 .probe = bfin_adv7393_fb_probe,
797 .remove = __devexit_p(bfin_adv7393_fb_remove), 797 .remove = bfin_adv7393_fb_remove,
798 .id_table = bfin_adv7393_id, 798 .id_table = bfin_adv7393_id,
799}; 799};
800 800
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
index c95b417d0d41..b09701c79432 100644
--- a/drivers/video/broadsheetfb.c
+++ b/drivers/video/broadsheetfb.c
@@ -91,7 +91,7 @@ static struct panel_info panel_table[] = {
91#define DPY_W 800 91#define DPY_W 800
92#define DPY_H 600 92#define DPY_H 600
93 93
94static struct fb_fix_screeninfo broadsheetfb_fix __devinitdata = { 94static struct fb_fix_screeninfo broadsheetfb_fix = {
95 .id = "broadsheetfb", 95 .id = "broadsheetfb",
96 .type = FB_TYPE_PACKED_PIXELS, 96 .type = FB_TYPE_PACKED_PIXELS,
97 .visual = FB_VISUAL_STATIC_PSEUDOCOLOR, 97 .visual = FB_VISUAL_STATIC_PSEUDOCOLOR,
@@ -102,7 +102,7 @@ static struct fb_fix_screeninfo broadsheetfb_fix __devinitdata = {
102 .accel = FB_ACCEL_NONE, 102 .accel = FB_ACCEL_NONE,
103}; 103};
104 104
105static struct fb_var_screeninfo broadsheetfb_var __devinitdata = { 105static struct fb_var_screeninfo broadsheetfb_var = {
106 .xres = DPY_W, 106 .xres = DPY_W,
107 .yres = DPY_H, 107 .yres = DPY_H,
108 .xres_virtual = DPY_W, 108 .xres_virtual = DPY_W,
@@ -774,7 +774,7 @@ static DEVICE_ATTR(loadstore_waveform, S_IWUSR, NULL,
774 broadsheet_loadstore_waveform); 774 broadsheet_loadstore_waveform);
775 775
776/* upper level functions that manipulate the display and other stuff */ 776/* upper level functions that manipulate the display and other stuff */
777static void __devinit broadsheet_init_display(struct broadsheetfb_par *par) 777static void broadsheet_init_display(struct broadsheetfb_par *par)
778{ 778{
779 u16 args[5]; 779 u16 args[5];
780 int xres = par->info->var.xres; 780 int xres = par->info->var.xres;
@@ -834,7 +834,7 @@ static void __devinit broadsheet_init_display(struct broadsheetfb_par *par)
834 par->board->wait_for_rdy(par); 834 par->board->wait_for_rdy(par);
835} 835}
836 836
837static void __devinit broadsheet_identify(struct broadsheetfb_par *par) 837static void broadsheet_identify(struct broadsheetfb_par *par)
838{ 838{
839 u16 rev, prc; 839 u16 rev, prc;
840 struct device *dev = par->info->device; 840 struct device *dev = par->info->device;
@@ -849,7 +849,7 @@ static void __devinit broadsheet_identify(struct broadsheetfb_par *par)
849 dev_warn(dev, "Unrecognized Broadsheet Revision\n"); 849 dev_warn(dev, "Unrecognized Broadsheet Revision\n");
850} 850}
851 851
852static void __devinit broadsheet_init(struct broadsheetfb_par *par) 852static void broadsheet_init(struct broadsheetfb_par *par)
853{ 853{
854 broadsheet_send_command(par, BS_CMD_INIT_SYS_RUN); 854 broadsheet_send_command(par, BS_CMD_INIT_SYS_RUN);
855 /* the controller needs a second */ 855 /* the controller needs a second */
@@ -1058,7 +1058,7 @@ static struct fb_deferred_io broadsheetfb_defio = {
1058 .deferred_io = broadsheetfb_dpy_deferred_io, 1058 .deferred_io = broadsheetfb_dpy_deferred_io,
1059}; 1059};
1060 1060
1061static int __devinit broadsheetfb_probe(struct platform_device *dev) 1061static int broadsheetfb_probe(struct platform_device *dev)
1062{ 1062{
1063 struct fb_info *info; 1063 struct fb_info *info;
1064 struct broadsheet_board *board; 1064 struct broadsheet_board *board;
@@ -1190,7 +1190,7 @@ err:
1190 1190
1191} 1191}
1192 1192
1193static int __devexit broadsheetfb_remove(struct platform_device *dev) 1193static int broadsheetfb_remove(struct platform_device *dev)
1194{ 1194{
1195 struct fb_info *info = platform_get_drvdata(dev); 1195 struct fb_info *info = platform_get_drvdata(dev);
1196 1196
@@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev)
1211 1211
1212static struct platform_driver broadsheetfb_driver = { 1212static struct platform_driver broadsheetfb_driver = {
1213 .probe = broadsheetfb_probe, 1213 .probe = broadsheetfb_probe,
1214 .remove = __devexit_p(broadsheetfb_remove), 1214 .remove = broadsheetfb_remove,
1215 .driver = { 1215 .driver = {
1216 .owner = THIS_MODULE, 1216 .owner = THIS_MODULE,
1217 .name = "broadsheetfb", 1217 .name = "broadsheetfb",
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 6bea9a936798..60017fc634b5 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -179,7 +179,7 @@ static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
179 * Initialisation 179 * Initialisation
180 */ 180 */
181 181
182static void __devinit bw2_init_fix(struct fb_info *info, int linebytes) 182static void bw2_init_fix(struct fb_info *info, int linebytes)
183{ 183{
184 strlcpy(info->fix.id, "bwtwo", sizeof(info->fix.id)); 184 strlcpy(info->fix.id, "bwtwo", sizeof(info->fix.id));
185 185
@@ -191,44 +191,43 @@ static void __devinit bw2_init_fix(struct fb_info *info, int linebytes)
191 info->fix.accel = FB_ACCEL_SUN_BWTWO; 191 info->fix.accel = FB_ACCEL_SUN_BWTWO;
192} 192}
193 193
194static u8 bw2regs_1600[] __devinitdata = { 194static u8 bw2regs_1600[] = {
195 0x14, 0x8b, 0x15, 0x28, 0x16, 0x03, 0x17, 0x13, 195 0x14, 0x8b, 0x15, 0x28, 0x16, 0x03, 0x17, 0x13,
196 0x18, 0x7b, 0x19, 0x05, 0x1a, 0x34, 0x1b, 0x2e, 196 0x18, 0x7b, 0x19, 0x05, 0x1a, 0x34, 0x1b, 0x2e,
197 0x1c, 0x00, 0x1d, 0x0a, 0x1e, 0xff, 0x1f, 0x01, 197 0x1c, 0x00, 0x1d, 0x0a, 0x1e, 0xff, 0x1f, 0x01,
198 0x10, 0x21, 0 198 0x10, 0x21, 0
199}; 199};
200 200
201static u8 bw2regs_ecl[] __devinitdata = { 201static u8 bw2regs_ecl[] = {
202 0x14, 0x65, 0x15, 0x1e, 0x16, 0x04, 0x17, 0x0c, 202 0x14, 0x65, 0x15, 0x1e, 0x16, 0x04, 0x17, 0x0c,
203 0x18, 0x5e, 0x19, 0x03, 0x1a, 0xa7, 0x1b, 0x23, 203 0x18, 0x5e, 0x19, 0x03, 0x1a, 0xa7, 0x1b, 0x23,
204 0x1c, 0x00, 0x1d, 0x08, 0x1e, 0xff, 0x1f, 0x01, 204 0x1c, 0x00, 0x1d, 0x08, 0x1e, 0xff, 0x1f, 0x01,
205 0x10, 0x20, 0 205 0x10, 0x20, 0
206}; 206};
207 207
208static u8 bw2regs_analog[] __devinitdata = { 208static u8 bw2regs_analog[] = {
209 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x03, 0x17, 0x13, 209 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x03, 0x17, 0x13,
210 0x18, 0xb0, 0x19, 0x03, 0x1a, 0xa6, 0x1b, 0x22, 210 0x18, 0xb0, 0x19, 0x03, 0x1a, 0xa6, 0x1b, 0x22,
211 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01, 211 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01,
212 0x10, 0x20, 0 212 0x10, 0x20, 0
213}; 213};
214 214
215static u8 bw2regs_76hz[] __devinitdata = { 215static u8 bw2regs_76hz[] = {
216 0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f, 216 0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f,
217 0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a, 217 0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a,
218 0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01, 218 0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01,
219 0x10, 0x24, 0 219 0x10, 0x24, 0
220}; 220};
221 221
222static u8 bw2regs_66hz[] __devinitdata = { 222static u8 bw2regs_66hz[] = {
223 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14, 223 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14,
224 0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24, 224 0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24,
225 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01, 225 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01,
226 0x10, 0x20, 0 226 0x10, 0x20, 0
227}; 227};
228 228
229static int __devinit bw2_do_default_mode(struct bw2_par *par, 229static int bw2_do_default_mode(struct bw2_par *par, struct fb_info *info,
230 struct fb_info *info, 230 int *linebytes)
231 int *linebytes)
232{ 231{
233 u8 status, mon; 232 u8 status, mon;
234 u8 *p; 233 u8 *p;
@@ -273,7 +272,7 @@ static int __devinit bw2_do_default_mode(struct bw2_par *par,
273 return 0; 272 return 0;
274} 273}
275 274
276static int __devinit bw2_probe(struct platform_device *op) 275static int bw2_probe(struct platform_device *op)
277{ 276{
278 struct device_node *dp = op->dev.of_node; 277 struct device_node *dp = op->dev.of_node;
279 struct fb_info *info; 278 struct fb_info *info;
@@ -352,7 +351,7 @@ out_err:
352 return err; 351 return err;
353} 352}
354 353
355static int __devexit bw2_remove(struct platform_device *op) 354static int bw2_remove(struct platform_device *op)
356{ 355{
357 struct fb_info *info = dev_get_drvdata(&op->dev); 356 struct fb_info *info = dev_get_drvdata(&op->dev);
358 struct bw2_par *par = info->par; 357 struct bw2_par *par = info->par;
@@ -384,7 +383,7 @@ static struct platform_driver bw2_driver = {
384 .of_match_table = bw2_match, 383 .of_match_table = bw2_match,
385 }, 384 },
386 .probe = bw2_probe, 385 .probe = bw2_probe,
387 .remove = __devexit_p(bw2_remove), 386 .remove = bw2_remove,
388}; 387};
389 388
390static int __init bw2_init(void) 389static int __init bw2_init(void)
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index 2c76fdf23f2a..153dd65b0ae8 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -78,7 +78,7 @@ struct carmine_fb {
78 u32 pseudo_palette[16]; 78 u32 pseudo_palette[16];
79}; 79};
80 80
81static struct fb_fix_screeninfo carminefb_fix __devinitdata = { 81static struct fb_fix_screeninfo carminefb_fix = {
82 .id = "Carmine", 82 .id = "Carmine",
83 .type = FB_TYPE_PACKED_PIXELS, 83 .type = FB_TYPE_PACKED_PIXELS,
84 .visual = FB_VISUAL_TRUECOLOR, 84 .visual = FB_VISUAL_TRUECOLOR,
@@ -537,8 +537,9 @@ static struct fb_ops carminefb_ops = {
537 .fb_setcolreg = carmine_setcolreg, 537 .fb_setcolreg = carmine_setcolreg,
538}; 538};
539 539
540static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base, 540static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
541 int smem_offset, struct device *device, struct fb_info **rinfo) 541 int smem_offset, struct device *device,
542 struct fb_info **rinfo)
542{ 543{
543 int ret; 544 int ret;
544 struct fb_info *info; 545 struct fb_info *info;
@@ -606,8 +607,7 @@ static void cleanup_fb_device(struct fb_info *info)
606 } 607 }
607} 608}
608 609
609static int __devinit carminefb_probe(struct pci_dev *dev, 610static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
610 const struct pci_device_id *ent)
611{ 611{
612 struct carmine_hw *hw; 612 struct carmine_hw *hw;
613 struct device *device = &dev->dev; 613 struct device *device = &dev->dev;
@@ -721,7 +721,7 @@ err_enable_pci:
721 return ret; 721 return ret;
722} 722}
723 723
724static void __devexit carminefb_remove(struct pci_dev *dev) 724static void carminefb_remove(struct pci_dev *dev)
725{ 725{
726 struct carmine_hw *hw = pci_get_drvdata(dev); 726 struct carmine_hw *hw = pci_get_drvdata(dev);
727 struct fb_fix_screeninfo fix; 727 struct fb_fix_screeninfo fix;
@@ -752,7 +752,7 @@ static void __devexit carminefb_remove(struct pci_dev *dev)
752} 752}
753 753
754#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf 754#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf
755static struct pci_device_id carmine_devices[] __devinitdata = { 755static struct pci_device_id carmine_devices[] = {
756{ 756{
757 PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)}, 757 PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)},
758 {0, 0, 0, 0, 0, 0, 0} 758 {0, 0, 0, 0, 0, 0, 0}
@@ -764,7 +764,7 @@ static struct pci_driver carmine_pci_driver = {
764 .name = "carminefb", 764 .name = "carminefb",
765 .id_table = carmine_devices, 765 .id_table = carmine_devices,
766 .probe = carminefb_probe, 766 .probe = carminefb_probe,
767 .remove = __devexit_p(carminefb_remove), 767 .remove = carminefb_remove,
768}; 768};
769 769
770static int __init carminefb_init(void) 770static int __init carminefb_init(void)
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index f18895006627..ed3b8891e006 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -352,8 +352,8 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
352 * Initialisation 352 * Initialisation
353 */ 353 */
354 354
355static void __devinit cg14_init_fix(struct fb_info *info, int linebytes, 355static void cg14_init_fix(struct fb_info *info, int linebytes,
356 struct device_node *dp) 356 struct device_node *dp)
357{ 357{
358 const char *name = dp->name; 358 const char *name = dp->name;
359 359
@@ -367,7 +367,7 @@ static void __devinit cg14_init_fix(struct fb_info *info, int linebytes,
367 info->fix.accel = FB_ACCEL_SUN_CG14; 367 info->fix.accel = FB_ACCEL_SUN_CG14;
368} 368}
369 369
370static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __devinitdata = { 370static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {
371 { 371 {
372 .voff = CG14_REGS, 372 .voff = CG14_REGS,
373 .poff = 0x80000000, 373 .poff = 0x80000000,
@@ -463,7 +463,7 @@ static void cg14_unmap_regs(struct platform_device *op, struct fb_info *info,
463 info->screen_base, info->fix.smem_len); 463 info->screen_base, info->fix.smem_len);
464} 464}
465 465
466static int __devinit cg14_probe(struct platform_device *op) 466static int cg14_probe(struct platform_device *op)
467{ 467{
468 struct device_node *dp = op->dev.of_node; 468 struct device_node *dp = op->dev.of_node;
469 struct fb_info *info; 469 struct fb_info *info;
@@ -571,7 +571,7 @@ out_err:
571 return err; 571 return err;
572} 572}
573 573
574static int __devexit cg14_remove(struct platform_device *op) 574static int cg14_remove(struct platform_device *op)
575{ 575{
576 struct fb_info *info = dev_get_drvdata(&op->dev); 576 struct fb_info *info = dev_get_drvdata(&op->dev);
577 struct cg14_par *par = info->par; 577 struct cg14_par *par = info->par;
@@ -603,7 +603,7 @@ static struct platform_driver cg14_driver = {
603 .of_match_table = cg14_match, 603 .of_match_table = cg14_match,
604 }, 604 },
605 .probe = cg14_probe, 605 .probe = cg14_probe,
606 .remove = __devexit_p(cg14_remove), 606 .remove = cg14_remove,
607}; 607};
608 608
609static int __init cg14_init(void) 609static int __init cg14_init(void)
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index c5e7612ff876..9f63507ded37 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -243,8 +243,8 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
243 * Initialisation 243 * Initialisation
244 */ 244 */
245 245
246static void __devinit cg3_init_fix(struct fb_info *info, int linebytes, 246static void cg3_init_fix(struct fb_info *info, int linebytes,
247 struct device_node *dp) 247 struct device_node *dp)
248{ 248{
249 strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); 249 strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
250 250
@@ -256,8 +256,8 @@ static void __devinit cg3_init_fix(struct fb_info *info, int linebytes,
256 info->fix.accel = FB_ACCEL_SUN_CGTHREE; 256 info->fix.accel = FB_ACCEL_SUN_CGTHREE;
257} 257}
258 258
259static void __devinit cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var, 259static void cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,
260 struct device_node *dp) 260 struct device_node *dp)
261{ 261{
262 const char *params; 262 const char *params;
263 char *p; 263 char *p;
@@ -279,36 +279,36 @@ static void __devinit cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,
279 } 279 }
280} 280}
281 281
282static u8 cg3regvals_66hz[] __devinitdata = { /* 1152 x 900, 66 Hz */ 282static u8 cg3regvals_66hz[] = { /* 1152 x 900, 66 Hz */
283 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14, 283 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14,
284 0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24, 284 0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24,
285 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01, 285 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01,
286 0x10, 0x20, 0 286 0x10, 0x20, 0
287}; 287};
288 288
289static u8 cg3regvals_76hz[] __devinitdata = { /* 1152 x 900, 76 Hz */ 289static u8 cg3regvals_76hz[] = { /* 1152 x 900, 76 Hz */
290 0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f, 290 0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f,
291 0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a, 291 0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a,
292 0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01, 292 0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01,
293 0x10, 0x24, 0 293 0x10, 0x24, 0
294}; 294};
295 295
296static u8 cg3regvals_rdi[] __devinitdata = { /* 640 x 480, cgRDI */ 296static u8 cg3regvals_rdi[] = { /* 640 x 480, cgRDI */
297 0x14, 0x70, 0x15, 0x20, 0x16, 0x08, 0x17, 0x10, 297 0x14, 0x70, 0x15, 0x20, 0x16, 0x08, 0x17, 0x10,
298 0x18, 0x06, 0x19, 0x02, 0x1a, 0x31, 0x1b, 0x51, 298 0x18, 0x06, 0x19, 0x02, 0x1a, 0x31, 0x1b, 0x51,
299 0x1c, 0x06, 0x1d, 0x0c, 0x1e, 0xff, 0x1f, 0x01, 299 0x1c, 0x06, 0x1d, 0x0c, 0x1e, 0xff, 0x1f, 0x01,
300 0x10, 0x22, 0 300 0x10, 0x22, 0
301}; 301};
302 302
303static u8 *cg3_regvals[] __devinitdata = { 303static u8 *cg3_regvals[] = {
304 cg3regvals_66hz, cg3regvals_76hz, cg3regvals_rdi 304 cg3regvals_66hz, cg3regvals_76hz, cg3regvals_rdi
305}; 305};
306 306
307static u_char cg3_dacvals[] __devinitdata = { 307static u_char cg3_dacvals[] = {
308 4, 0xff, 5, 0x00, 6, 0x70, 7, 0x00, 0 308 4, 0xff, 5, 0x00, 6, 0x70, 7, 0x00, 0
309}; 309};
310 310
311static int __devinit cg3_do_default_mode(struct cg3_par *par) 311static int cg3_do_default_mode(struct cg3_par *par)
312{ 312{
313 enum cg3_type type; 313 enum cg3_type type;
314 u8 *p; 314 u8 *p;
@@ -346,7 +346,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par)
346 return 0; 346 return 0;
347} 347}
348 348
349static int __devinit cg3_probe(struct platform_device *op) 349static int cg3_probe(struct platform_device *op)
350{ 350{
351 struct device_node *dp = op->dev.of_node; 351 struct device_node *dp = op->dev.of_node;
352 struct fb_info *info; 352 struct fb_info *info;
@@ -433,7 +433,7 @@ out_err:
433 return err; 433 return err;
434} 434}
435 435
436static int __devexit cg3_remove(struct platform_device *op) 436static int cg3_remove(struct platform_device *op)
437{ 437{
438 struct fb_info *info = dev_get_drvdata(&op->dev); 438 struct fb_info *info = dev_get_drvdata(&op->dev);
439 struct cg3_par *par = info->par; 439 struct cg3_par *par = info->par;
@@ -469,7 +469,7 @@ static struct platform_driver cg3_driver = {
469 .of_match_table = cg3_match, 469 .of_match_table = cg3_match,
470 }, 470 },
471 .probe = cg3_probe, 471 .probe = cg3_probe,
472 .remove = __devexit_p(cg3_remove), 472 .remove = cg3_remove,
473}; 473};
474 474
475static int __init cg3_init(void) 475static int __init cg3_init(void)
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 179e96cdb323..3545decc7485 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -607,7 +607,7 @@ static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
607 * Initialisation 607 * Initialisation
608 */ 608 */
609 609
610static void __devinit cg6_init_fix(struct fb_info *info, int linebytes) 610static void cg6_init_fix(struct fb_info *info, int linebytes)
611{ 611{
612 struct cg6_par *par = (struct cg6_par *)info->par; 612 struct cg6_par *par = (struct cg6_par *)info->par;
613 const char *cg6_cpu_name, *cg6_card_name; 613 const char *cg6_cpu_name, *cg6_card_name;
@@ -649,7 +649,7 @@ static void __devinit cg6_init_fix(struct fb_info *info, int linebytes)
649} 649}
650 650
651/* Initialize Brooktree DAC */ 651/* Initialize Brooktree DAC */
652static void __devinit cg6_bt_init(struct cg6_par *par) 652static void cg6_bt_init(struct cg6_par *par)
653{ 653{
654 struct bt_regs __iomem *bt = par->bt; 654 struct bt_regs __iomem *bt = par->bt;
655 655
@@ -663,7 +663,7 @@ static void __devinit cg6_bt_init(struct cg6_par *par)
663 sbus_writel(0x00 << 24, &bt->control); 663 sbus_writel(0x00 << 24, &bt->control);
664} 664}
665 665
666static void __devinit cg6_chip_init(struct fb_info *info) 666static void cg6_chip_init(struct fb_info *info)
667{ 667{
668 struct cg6_par *par = (struct cg6_par *)info->par; 668 struct cg6_par *par = (struct cg6_par *)info->par;
669 struct cg6_tec __iomem *tec = par->tec; 669 struct cg6_tec __iomem *tec = par->tec;
@@ -737,7 +737,7 @@ static void cg6_unmap_regs(struct platform_device *op, struct fb_info *info,
737 info->fix.smem_len); 737 info->fix.smem_len);
738} 738}
739 739
740static int __devinit cg6_probe(struct platform_device *op) 740static int cg6_probe(struct platform_device *op)
741{ 741{
742 struct device_node *dp = op->dev.of_node; 742 struct device_node *dp = op->dev.of_node;
743 struct fb_info *info; 743 struct fb_info *info;
@@ -827,7 +827,7 @@ out_err:
827 return err; 827 return err;
828} 828}
829 829
830static int __devexit cg6_remove(struct platform_device *op) 830static int cg6_remove(struct platform_device *op)
831{ 831{
832 struct fb_info *info = dev_get_drvdata(&op->dev); 832 struct fb_info *info = dev_get_drvdata(&op->dev);
833 struct cg6_par *par = info->par; 833 struct cg6_par *par = info->par;
@@ -862,7 +862,7 @@ static struct platform_driver cg6_driver = {
862 .of_match_table = cg6_match, 862 .of_match_table = cg6_match,
863 }, 863 },
864 .probe = cg6_probe, 864 .probe = cg6_probe,
865 .remove = __devexit_p(cg6_remove), 865 .remove = cg6_remove,
866}; 866};
867 867
868static int __init cg6_init(void) 868static int __init cg6_init(void)
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index cff742abdc5d..206a66b61072 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -292,7 +292,7 @@ static void __init chips_hw_init(void)
292 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data); 292 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
293} 293}
294 294
295static struct fb_fix_screeninfo chipsfb_fix __devinitdata = { 295static struct fb_fix_screeninfo chipsfb_fix = {
296 .id = "C&T 65550", 296 .id = "C&T 65550",
297 .type = FB_TYPE_PACKED_PIXELS, 297 .type = FB_TYPE_PACKED_PIXELS,
298 .visual = FB_VISUAL_PSEUDOCOLOR, 298 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -309,7 +309,7 @@ static struct fb_fix_screeninfo chipsfb_fix __devinitdata = {
309 .smem_len = 0x100000, /* 1MB */ 309 .smem_len = 0x100000, /* 1MB */
310}; 310};
311 311
312static struct fb_var_screeninfo chipsfb_var __devinitdata = { 312static struct fb_var_screeninfo chipsfb_var = {
313 .xres = 800, 313 .xres = 800,
314 .yres = 600, 314 .yres = 600,
315 .xres_virtual = 800, 315 .xres_virtual = 800,
@@ -330,7 +330,7 @@ static struct fb_var_screeninfo chipsfb_var __devinitdata = {
330 .vsync_len = 8, 330 .vsync_len = 8,
331}; 331};
332 332
333static void __devinit init_chips(struct fb_info *p, unsigned long addr) 333static void init_chips(struct fb_info *p, unsigned long addr)
334{ 334{
335 memset(p->screen_base, 0, 0x100000); 335 memset(p->screen_base, 0, 0x100000);
336 336
@@ -347,8 +347,7 @@ static void __devinit init_chips(struct fb_info *p, unsigned long addr)
347 chips_hw_init(); 347 chips_hw_init();
348} 348}
349 349
350static int __devinit 350static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
351chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
352{ 351{
353 struct fb_info *p; 352 struct fb_info *p;
354 unsigned long addr, size; 353 unsigned long addr, size;
@@ -438,7 +437,7 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
438 return rc; 437 return rc;
439} 438}
440 439
441static void __devexit chipsfb_remove(struct pci_dev *dp) 440static void chipsfb_remove(struct pci_dev *dp)
442{ 441{
443 struct fb_info *p = pci_get_drvdata(dp); 442 struct fb_info *p = pci_get_drvdata(dp);
444 443
@@ -495,7 +494,7 @@ static struct pci_driver chipsfb_driver = {
495 .name = "chipsfb", 494 .name = "chipsfb",
496 .id_table = chipsfb_pci_tbl, 495 .id_table = chipsfb_pci_tbl,
497 .probe = chipsfb_pci_init, 496 .probe = chipsfb_pci_init,
498 .remove = __devexit_p(chipsfb_remove), 497 .remove = chipsfb_remove,
499#ifdef CONFIG_PM 498#ifdef CONFIG_PM
500 .suspend = chipsfb_pci_suspend, 499 .suspend = chipsfb_pci_suspend,
501 .resume = chipsfb_pci_resume, 500 .resume = chipsfb_pci_resume,
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index bc67d05cad60..c3dbbe6e3acf 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -290,34 +290,34 @@ struct zorrocl {
290 zorro_id ramid2; /* Zorro ID of optional second RAM device */ 290 zorro_id ramid2; /* Zorro ID of optional second RAM device */
291}; 291};
292 292
293static const struct zorrocl zcl_sd64 __devinitconst = { 293static const struct zorrocl zcl_sd64 = {
294 .type = BT_SD64, 294 .type = BT_SD64,
295 .ramid = ZORRO_PROD_HELFRICH_SD64_RAM, 295 .ramid = ZORRO_PROD_HELFRICH_SD64_RAM,
296}; 296};
297 297
298static const struct zorrocl zcl_piccolo __devinitconst = { 298static const struct zorrocl zcl_piccolo = {
299 .type = BT_PICCOLO, 299 .type = BT_PICCOLO,
300 .ramid = ZORRO_PROD_HELFRICH_PICCOLO_RAM, 300 .ramid = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
301}; 301};
302 302
303static const struct zorrocl zcl_picasso __devinitconst = { 303static const struct zorrocl zcl_picasso = {
304 .type = BT_PICASSO, 304 .type = BT_PICASSO,
305 .ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM, 305 .ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
306}; 306};
307 307
308static const struct zorrocl zcl_spectrum __devinitconst = { 308static const struct zorrocl zcl_spectrum = {
309 .type = BT_SPECTRUM, 309 .type = BT_SPECTRUM,
310 .ramid = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM, 310 .ramid = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
311}; 311};
312 312
313static const struct zorrocl zcl_picasso4_z3 __devinitconst = { 313static const struct zorrocl zcl_picasso4_z3 = {
314 .type = BT_PICASSO4, 314 .type = BT_PICASSO4,
315 .regoffset = 0x00600000, 315 .regoffset = 0x00600000,
316 .ramsize = 4 * MB_, 316 .ramsize = 4 * MB_,
317 .ramoffset = 0x01000000, /* 0x02000000 for 64 MiB boards */ 317 .ramoffset = 0x01000000, /* 0x02000000 for 64 MiB boards */
318}; 318};
319 319
320static const struct zorrocl zcl_picasso4_z2 __devinitconst = { 320static const struct zorrocl zcl_picasso4_z2 = {
321 .type = BT_PICASSO4, 321 .type = BT_PICASSO4,
322 .regoffset = 0x10000, 322 .regoffset = 0x10000,
323 .ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1, 323 .ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1,
@@ -325,7 +325,7 @@ static const struct zorrocl zcl_picasso4_z2 __devinitconst = {
325}; 325};
326 326
327 327
328static const struct zorro_device_id cirrusfb_zorro_table[] __devinitconst = { 328static const struct zorro_device_id cirrusfb_zorro_table[] = {
329 { 329 {
330 .id = ZORRO_PROD_HELFRICH_SD64_REG, 330 .id = ZORRO_PROD_HELFRICH_SD64_REG,
331 .driver_data = (unsigned long)&zcl_sd64, 331 .driver_data = (unsigned long)&zcl_sd64,
@@ -372,8 +372,8 @@ struct cirrusfb_info {
372 void (*unmap)(struct fb_info *info); 372 void (*unmap)(struct fb_info *info);
373}; 373};
374 374
375static bool noaccel __devinitdata; 375static bool noaccel;
376static char *mode_option __devinitdata = "640x480@60"; 376static char *mode_option = "640x480@60";
377 377
378/****************************************************************************/ 378/****************************************************************************/
379/**** BEGIN PROTOTYPES ******************************************************/ 379/**** BEGIN PROTOTYPES ******************************************************/
@@ -1892,8 +1892,8 @@ static int release_io_ports;
1892 * based on the DRAM bandwidth bit and DRAM bank switching bit. This 1892 * based on the DRAM bandwidth bit and DRAM bank switching bit. This
1893 * works with 1MB, 2MB and 4MB configurations (which the Motorola boards 1893 * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
1894 * seem to have. */ 1894 * seem to have. */
1895static unsigned int __devinit cirrusfb_get_memsize(struct fb_info *info, 1895static unsigned int cirrusfb_get_memsize(struct fb_info *info,
1896 u8 __iomem *regbase) 1896 u8 __iomem *regbase)
1897{ 1897{
1898 unsigned long mem; 1898 unsigned long mem;
1899 struct cirrusfb_info *cinfo = info->par; 1899 struct cirrusfb_info *cinfo = info->par;
@@ -2003,7 +2003,7 @@ static struct fb_ops cirrusfb_ops = {
2003 .fb_imageblit = cirrusfb_imageblit, 2003 .fb_imageblit = cirrusfb_imageblit,
2004}; 2004};
2005 2005
2006static int __devinit cirrusfb_set_fbinfo(struct fb_info *info) 2006static int cirrusfb_set_fbinfo(struct fb_info *info)
2007{ 2007{
2008 struct cirrusfb_info *cinfo = info->par; 2008 struct cirrusfb_info *cinfo = info->par;
2009 struct fb_var_screeninfo *var = &info->var; 2009 struct fb_var_screeninfo *var = &info->var;
@@ -2052,7 +2052,7 @@ static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
2052 return 0; 2052 return 0;
2053} 2053}
2054 2054
2055static int __devinit cirrusfb_register(struct fb_info *info) 2055static int cirrusfb_register(struct fb_info *info)
2056{ 2056{
2057 struct cirrusfb_info *cinfo = info->par; 2057 struct cirrusfb_info *cinfo = info->par;
2058 int err; 2058 int err;
@@ -2096,7 +2096,7 @@ err_dealloc_cmap:
2096 return err; 2096 return err;
2097} 2097}
2098 2098
2099static void __devexit cirrusfb_cleanup(struct fb_info *info) 2099static void cirrusfb_cleanup(struct fb_info *info)
2100{ 2100{
2101 struct cirrusfb_info *cinfo = info->par; 2101 struct cirrusfb_info *cinfo = info->par;
2102 2102
@@ -2109,8 +2109,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)
2109} 2109}
2110 2110
2111#ifdef CONFIG_PCI 2111#ifdef CONFIG_PCI
2112static int __devinit cirrusfb_pci_register(struct pci_dev *pdev, 2112static int cirrusfb_pci_register(struct pci_dev *pdev,
2113 const struct pci_device_id *ent) 2113 const struct pci_device_id *ent)
2114{ 2114{
2115 struct cirrusfb_info *cinfo; 2115 struct cirrusfb_info *cinfo;
2116 struct fb_info *info; 2116 struct fb_info *info;
@@ -2215,7 +2215,7 @@ err_out:
2215 return ret; 2215 return ret;
2216} 2216}
2217 2217
2218static void __devexit cirrusfb_pci_unregister(struct pci_dev *pdev) 2218static void cirrusfb_pci_unregister(struct pci_dev *pdev)
2219{ 2219{
2220 struct fb_info *info = pci_get_drvdata(pdev); 2220 struct fb_info *info = pci_get_drvdata(pdev);
2221 2221
@@ -2226,7 +2226,7 @@ static struct pci_driver cirrusfb_pci_driver = {
2226 .name = "cirrusfb", 2226 .name = "cirrusfb",
2227 .id_table = cirrusfb_pci_table, 2227 .id_table = cirrusfb_pci_table,
2228 .probe = cirrusfb_pci_register, 2228 .probe = cirrusfb_pci_register,
2229 .remove = __devexit_p(cirrusfb_pci_unregister), 2229 .remove = cirrusfb_pci_unregister,
2230#ifdef CONFIG_PM 2230#ifdef CONFIG_PM
2231#if 0 2231#if 0
2232 .suspend = cirrusfb_pci_suspend, 2232 .suspend = cirrusfb_pci_suspend,
@@ -2237,8 +2237,8 @@ static struct pci_driver cirrusfb_pci_driver = {
2237#endif /* CONFIG_PCI */ 2237#endif /* CONFIG_PCI */
2238 2238
2239#ifdef CONFIG_ZORRO 2239#ifdef CONFIG_ZORRO
2240static int __devinit cirrusfb_zorro_register(struct zorro_dev *z, 2240static int cirrusfb_zorro_register(struct zorro_dev *z,
2241 const struct zorro_device_id *ent) 2241 const struct zorro_device_id *ent)
2242{ 2242{
2243 struct fb_info *info; 2243 struct fb_info *info;
2244 int error; 2244 int error;
@@ -2352,7 +2352,7 @@ err_release_fb:
2352 return error; 2352 return error;
2353} 2353}
2354 2354
2355void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z) 2355void cirrusfb_zorro_unregister(struct zorro_dev *z)
2356{ 2356{
2357 struct fb_info *info = zorro_get_drvdata(z); 2357 struct fb_info *info = zorro_get_drvdata(z);
2358 2358
@@ -2364,7 +2364,7 @@ static struct zorro_driver cirrusfb_zorro_driver = {
2364 .name = "cirrusfb", 2364 .name = "cirrusfb",
2365 .id_table = cirrusfb_zorro_table, 2365 .id_table = cirrusfb_zorro_table,
2366 .probe = cirrusfb_zorro_register, 2366 .probe = cirrusfb_zorro_register,
2367 .remove = __devexit_p(cirrusfb_zorro_unregister), 2367 .remove = cirrusfb_zorro_unregister,
2368}; 2368};
2369#endif /* CONFIG_ZORRO */ 2369#endif /* CONFIG_ZORRO */
2370 2370
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 63ecdf8f7baf..5a7af0deced2 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -178,7 +178,7 @@ static struct fb_ops clps7111fb_ops = {
178 .fb_imageblit = cfb_imageblit, 178 .fb_imageblit = cfb_imageblit,
179}; 179};
180 180
181static void __devinit clps711x_guess_lcd_params(struct fb_info *info) 181static void clps711x_guess_lcd_params(struct fb_info *info)
182{ 182{
183 unsigned int lcdcon, syscon, size; 183 unsigned int lcdcon, syscon, size;
184 unsigned long phys_base = PAGE_OFFSET; 184 unsigned long phys_base = PAGE_OFFSET;
@@ -266,7 +266,7 @@ static void __devinit clps711x_guess_lcd_params(struct fb_info *info)
266 info->fix.type = FB_TYPE_PACKED_PIXELS; 266 info->fix.type = FB_TYPE_PACKED_PIXELS;
267} 267}
268 268
269static int __devinit clps711x_fb_probe(struct platform_device *pdev) 269static int clps711x_fb_probe(struct platform_device *pdev)
270{ 270{
271 int err = -ENOMEM; 271 int err = -ENOMEM;
272 272
@@ -291,7 +291,7 @@ static int __devinit clps711x_fb_probe(struct platform_device *pdev)
291out: return err; 291out: return err;
292} 292}
293 293
294static int __devexit clps711x_fb_remove(struct platform_device *pdev) 294static int clps711x_fb_remove(struct platform_device *pdev)
295{ 295{
296 unregister_framebuffer(cfb); 296 unregister_framebuffer(cfb);
297 kfree(cfb); 297 kfree(cfb);
@@ -305,7 +305,7 @@ static struct platform_driver clps711x_fb_driver = {
305 .owner = THIS_MODULE, 305 .owner = THIS_MODULE,
306 }, 306 },
307 .probe = clps711x_fb_probe, 307 .probe = clps711x_fb_probe,
308 .remove = __devexit_p(clps711x_fb_remove), 308 .remove = clps711x_fb_remove,
309}; 309};
310module_platform_driver(clps711x_fb_driver); 310module_platform_driver(clps711x_fb_driver);
311 311
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index 01a4ee7cc6b1..a9031498e10c 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -167,7 +167,7 @@ static void lcd_clear(struct fb_info *info)
167 lcd_write_control(info, LCD_RESET); 167 lcd_write_control(info, LCD_RESET);
168} 168}
169 169
170static struct fb_fix_screeninfo cobalt_lcdfb_fix __devinitdata = { 170static struct fb_fix_screeninfo cobalt_lcdfb_fix = {
171 .id = "cobalt-lcd", 171 .id = "cobalt-lcd",
172 .type = FB_TYPE_TEXT, 172 .type = FB_TYPE_TEXT,
173 .type_aux = FB_AUX_TEXT_MDA, 173 .type_aux = FB_AUX_TEXT_MDA,
@@ -331,7 +331,7 @@ static struct fb_ops cobalt_lcd_fbops = {
331 .fb_cursor = cobalt_lcdfb_cursor, 331 .fb_cursor = cobalt_lcdfb_cursor,
332}; 332};
333 333
334static int __devinit cobalt_lcdfb_probe(struct platform_device *dev) 334static int cobalt_lcdfb_probe(struct platform_device *dev)
335{ 335{
336 struct fb_info *info; 336 struct fb_info *info;
337 struct resource *res; 337 struct resource *res;
@@ -374,7 +374,7 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
374 return 0; 374 return 0;
375} 375}
376 376
377static int __devexit cobalt_lcdfb_remove(struct platform_device *dev) 377static int cobalt_lcdfb_remove(struct platform_device *dev)
378{ 378{
379 struct fb_info *info; 379 struct fb_info *info;
380 380
@@ -389,7 +389,7 @@ static int __devexit cobalt_lcdfb_remove(struct platform_device *dev)
389 389
390static struct platform_driver cobalt_lcdfb_driver = { 390static struct platform_driver cobalt_lcdfb_driver = {
391 .probe = cobalt_lcdfb_probe, 391 .probe = cobalt_lcdfb_probe,
392 .remove = __devexit_p(cobalt_lcdfb_remove), 392 .remove = cobalt_lcdfb_remove,
393 .driver = { 393 .driver = {
394 .name = "cobalt-lcd", 394 .name = "cobalt-lcd",
395 .owner = THIS_MODULE, 395 .owner = THIS_MODULE,
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 39571f9e0162..35687fd56456 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -238,8 +238,7 @@ static void sti_flush(unsigned long start, unsigned long end)
238 flush_icache_range(start, end); 238 flush_icache_range(start, end);
239} 239}
240 240
241static void __devinit sti_rom_copy(unsigned long base, unsigned long count, 241static void sti_rom_copy(unsigned long base, unsigned long count, void *dest)
242 void *dest)
243{ 242{
244 unsigned long dest_start = (unsigned long) dest; 243 unsigned long dest_start = (unsigned long) dest;
245 244
@@ -266,7 +265,7 @@ static void __devinit sti_rom_copy(unsigned long base, unsigned long count,
266static char default_sti_path[21] __read_mostly; 265static char default_sti_path[21] __read_mostly;
267 266
268#ifndef MODULE 267#ifndef MODULE
269static int __devinit sti_setup(char *str) 268static int sti_setup(char *str)
270{ 269{
271 if (str) 270 if (str)
272 strlcpy (default_sti_path, str, sizeof (default_sti_path)); 271 strlcpy (default_sti_path, str, sizeof (default_sti_path));
@@ -285,12 +284,12 @@ __setup("sti=", sti_setup);
285 284
286 285
287 286
288static char __devinitdata *font_name[MAX_STI_ROMS] = { "VGA8x16", }; 287static char *font_name[MAX_STI_ROMS] = { "VGA8x16", };
289static int __devinitdata font_index[MAX_STI_ROMS], 288static int font_index[MAX_STI_ROMS],
290 font_height[MAX_STI_ROMS], 289 font_height[MAX_STI_ROMS],
291 font_width[MAX_STI_ROMS]; 290 font_width[MAX_STI_ROMS];
292#ifndef MODULE 291#ifndef MODULE
293static int __devinit sti_font_setup(char *str) 292static int sti_font_setup(char *str)
294{ 293{
295 char *x; 294 char *x;
296 int i = 0; 295 int i = 0;
@@ -343,8 +342,8 @@ __setup("sti_font=", sti_font_setup);
343 342
344 343
345 344
346static void __devinit 345static void sti_dump_globcfg(struct sti_glob_cfg *glob_cfg,
347sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request) 346 unsigned int sti_mem_request)
348{ 347{
349 struct sti_glob_cfg_ext *cfg; 348 struct sti_glob_cfg_ext *cfg;
350 349
@@ -383,8 +382,7 @@ sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
383 cfg->sti_mem_addr, sti_mem_request)); 382 cfg->sti_mem_addr, sti_mem_request));
384} 383}
385 384
386static void __devinit 385static void sti_dump_outptr(struct sti_struct *sti)
387sti_dump_outptr(struct sti_struct *sti)
388{ 386{
389 DPRINTK((KERN_INFO 387 DPRINTK((KERN_INFO
390 "%d bits per pixel\n" 388 "%d bits per pixel\n"
@@ -397,9 +395,8 @@ sti_dump_outptr(struct sti_struct *sti)
397 sti->outptr.attributes)); 395 sti->outptr.attributes));
398} 396}
399 397
400static int __devinit 398static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address,
401sti_init_glob_cfg(struct sti_struct *sti, 399 unsigned long hpa)
402 unsigned long rom_address, unsigned long hpa)
403{ 400{
404 struct sti_glob_cfg *glob_cfg; 401 struct sti_glob_cfg *glob_cfg;
405 struct sti_glob_cfg_ext *glob_cfg_ext; 402 struct sti_glob_cfg_ext *glob_cfg_ext;
@@ -479,8 +476,8 @@ sti_init_glob_cfg(struct sti_struct *sti,
479} 476}
480 477
481#ifdef CONFIG_FB 478#ifdef CONFIG_FB
482static struct sti_cooked_font __devinit 479static struct sti_cooked_font *
483*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) 480sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
484{ 481{
485 const struct font_desc *fbfont; 482 const struct font_desc *fbfont;
486 unsigned int size, bpc; 483 unsigned int size, bpc;
@@ -535,16 +532,15 @@ static struct sti_cooked_font __devinit
535 return cooked_font; 532 return cooked_font;
536} 533}
537#else 534#else
538static struct sti_cooked_font __devinit 535static struct sti_cooked_font *
539*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) 536sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
540{ 537{
541 return NULL; 538 return NULL;
542} 539}
543#endif 540#endif
544 541
545static struct sti_cooked_font __devinit 542static struct sti_cooked_font *sti_select_font(struct sti_cooked_rom *rom,
546*sti_select_font(struct sti_cooked_rom *rom, 543 int (*search_font_fnc)(struct sti_cooked_rom *, int, int))
547 int (*search_font_fnc)(struct sti_cooked_rom *, int, int))
548{ 544{
549 struct sti_cooked_font *font; 545 struct sti_cooked_font *font;
550 int i; 546 int i;
@@ -569,8 +565,7 @@ static struct sti_cooked_font __devinit
569} 565}
570 566
571 567
572static void __devinit 568static void sti_dump_rom(struct sti_rom *rom)
573sti_dump_rom(struct sti_rom *rom)
574{ 569{
575 printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n", 570 printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n",
576 rom->graphics_id[0], 571 rom->graphics_id[0],
@@ -587,9 +582,8 @@ sti_dump_rom(struct sti_rom *rom)
587} 582}
588 583
589 584
590static int __devinit 585static int sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
591sti_cook_fonts(struct sti_cooked_rom *cooked_rom, 586 struct sti_rom *raw_rom)
592 struct sti_rom *raw_rom)
593{ 587{
594 struct sti_rom_font *raw_font, *font_start; 588 struct sti_rom_font *raw_font, *font_start;
595 struct sti_cooked_font *cooked_font; 589 struct sti_cooked_font *cooked_font;
@@ -622,8 +616,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
622} 616}
623 617
624 618
625static int __devinit 619static int sti_search_font(struct sti_cooked_rom *rom, int height, int width)
626sti_search_font(struct sti_cooked_rom *rom, int height, int width)
627{ 620{
628 struct sti_cooked_font *font; 621 struct sti_cooked_font *font;
629 int i = 0; 622 int i = 0;
@@ -639,8 +632,7 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width)
639#define BMODE_RELOCATE(offset) offset = (offset) / 4; 632#define BMODE_RELOCATE(offset) offset = (offset) / 4;
640#define BMODE_LAST_ADDR_OFFS 0x50 633#define BMODE_LAST_ADDR_OFFS 0x50
641 634
642static void * __devinit 635static void *sti_bmode_font_raw(struct sti_cooked_font *f)
643sti_bmode_font_raw(struct sti_cooked_font *f)
644{ 636{
645 unsigned char *n, *p, *q; 637 unsigned char *n, *p, *q;
646 int size = f->raw->bytes_per_char*256+sizeof(struct sti_rom_font); 638 int size = f->raw->bytes_per_char*256+sizeof(struct sti_rom_font);
@@ -657,8 +649,8 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
657 return n + 3; 649 return n + 3;
658} 650}
659 651
660static void __devinit 652static void sti_bmode_rom_copy(unsigned long base, unsigned long count,
661sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) 653 void *dest)
662{ 654{
663 unsigned long dest_start = (unsigned long) dest; 655 unsigned long dest_start = (unsigned long) dest;
664 656
@@ -672,8 +664,7 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
672 sti_flush(dest_start, (unsigned long)dest); 664 sti_flush(dest_start, (unsigned long)dest);
673} 665}
674 666
675static struct sti_rom * __devinit 667static struct sti_rom *sti_get_bmode_rom (unsigned long address)
676sti_get_bmode_rom (unsigned long address)
677{ 668{
678 struct sti_rom *raw; 669 struct sti_rom *raw;
679 u32 size; 670 u32 size;
@@ -708,7 +699,7 @@ sti_get_bmode_rom (unsigned long address)
708 return raw; 699 return raw;
709} 700}
710 701
711static struct sti_rom __devinit *sti_get_wmode_rom(unsigned long address) 702static struct sti_rom *sti_get_wmode_rom(unsigned long address)
712{ 703{
713 struct sti_rom *raw; 704 struct sti_rom *raw;
714 unsigned long size; 705 unsigned long size;
@@ -723,8 +714,8 @@ static struct sti_rom __devinit *sti_get_wmode_rom(unsigned long address)
723 return raw; 714 return raw;
724} 715}
725 716
726static int __devinit sti_read_rom(int wordmode, struct sti_struct *sti, 717static int sti_read_rom(int wordmode, struct sti_struct *sti,
727 unsigned long address) 718 unsigned long address)
728{ 719{
729 struct sti_cooked_rom *cooked; 720 struct sti_cooked_rom *cooked;
730 struct sti_rom *raw = NULL; 721 struct sti_rom *raw = NULL;
@@ -806,8 +797,9 @@ out_err:
806 return 0; 797 return 0;
807} 798}
808 799
809static struct sti_struct * __devinit 800static struct sti_struct *sti_try_rom_generic(unsigned long address,
810sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd) 801 unsigned long hpa,
802 struct pci_dev *pd)
811{ 803{
812 struct sti_struct *sti; 804 struct sti_struct *sti;
813 int ok; 805 int ok;
@@ -921,7 +913,7 @@ out_err:
921 return NULL; 913 return NULL;
922} 914}
923 915
924static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char *path) 916static void sticore_check_for_default_sti(struct sti_struct *sti, char *path)
925{ 917{
926 if (strcmp (path, default_sti_path) == 0) 918 if (strcmp (path, default_sti_path) == 0)
927 default_sti = sti; 919 default_sti = sti;
@@ -932,7 +924,7 @@ static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char
932 * in the additional address field addr[1] while on 924 * in the additional address field addr[1] while on
933 * older Systems the PDC stores it in page0->proc_sti 925 * older Systems the PDC stores it in page0->proc_sti
934 */ 926 */
935static int __devinit sticore_pa_init(struct parisc_device *dev) 927static int sticore_pa_init(struct parisc_device *dev)
936{ 928{
937 char pa_path[21]; 929 char pa_path[21];
938 struct sti_struct *sti = NULL; 930 struct sti_struct *sti = NULL;
@@ -953,8 +945,7 @@ static int __devinit sticore_pa_init(struct parisc_device *dev)
953} 945}
954 946
955 947
956static int __devinit sticore_pci_init(struct pci_dev *pd, 948static int sticore_pci_init(struct pci_dev *pd, const struct pci_device_id *ent)
957 const struct pci_device_id *ent)
958{ 949{
959#ifdef CONFIG_PCI 950#ifdef CONFIG_PCI
960 unsigned long fb_base, rom_base; 951 unsigned long fb_base, rom_base;
@@ -1001,7 +992,7 @@ static int __devinit sticore_pci_init(struct pci_dev *pd,
1001} 992}
1002 993
1003 994
1004static void __devexit sticore_pci_remove(struct pci_dev *pd) 995static void sticore_pci_remove(struct pci_dev *pd)
1005{ 996{
1006 BUG(); 997 BUG();
1007} 998}
@@ -1043,7 +1034,7 @@ static struct parisc_driver pa_sti_driver = {
1043 1034
1044static int sticore_initialized __read_mostly; 1035static int sticore_initialized __read_mostly;
1045 1036
1046static void __devinit sti_init_roms(void) 1037static void sti_init_roms(void)
1047{ 1038{
1048 if (sticore_initialized) 1039 if (sticore_initialized)
1049 return; 1040 return;
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index e40125cb313e..57886787ead0 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1230,7 +1230,7 @@ static int cyber2000fb_ddc_getsda(void *data)
1230 return retval; 1230 return retval;
1231} 1231}
1232 1232
1233static int __devinit cyber2000fb_setup_ddc_bus(struct cfb_info *cfb) 1233static int cyber2000fb_setup_ddc_bus(struct cfb_info *cfb)
1234{ 1234{
1235 strlcpy(cfb->ddc_adapter.name, cfb->fb.fix.id, 1235 strlcpy(cfb->ddc_adapter.name, cfb->fb.fix.id,
1236 sizeof(cfb->ddc_adapter.name)); 1236 sizeof(cfb->ddc_adapter.name));
@@ -1305,7 +1305,7 @@ static int cyber2000fb_i2c_getscl(void *data)
1305 return ret; 1305 return ret;
1306} 1306}
1307 1307
1308static int __devinit cyber2000fb_i2c_register(struct cfb_info *cfb) 1308static int cyber2000fb_i2c_register(struct cfb_info *cfb)
1309{ 1309{
1310 strlcpy(cfb->i2c_adapter.name, cfb->fb.fix.id, 1310 strlcpy(cfb->i2c_adapter.name, cfb->fb.fix.id,
1311 sizeof(cfb->i2c_adapter.name)); 1311 sizeof(cfb->i2c_adapter.name));
@@ -1336,7 +1336,7 @@ static void cyber2000fb_i2c_unregister(struct cfb_info *cfb)
1336 * These parameters give 1336 * These parameters give
1337 * 640x480, hsync 31.5kHz, vsync 60Hz 1337 * 640x480, hsync 31.5kHz, vsync 60Hz
1338 */ 1338 */
1339static struct fb_videomode __devinitdata cyber2000fb_default_mode = { 1339static struct fb_videomode cyber2000fb_default_mode = {
1340 .refresh = 60, 1340 .refresh = 60,
1341 .xres = 640, 1341 .xres = 640,
1342 .yres = 480, 1342 .yres = 480,
@@ -1404,8 +1404,7 @@ static void cyberpro_init_hw(struct cfb_info *cfb)
1404 } 1404 }
1405} 1405}
1406 1406
1407static struct cfb_info __devinit *cyberpro_alloc_fb_info(unsigned int id, 1407static struct cfb_info *cyberpro_alloc_fb_info(unsigned int id, char *name)
1408 char *name)
1409{ 1408{
1410 struct cfb_info *cfb; 1409 struct cfb_info *cfb;
1411 1410
@@ -1524,7 +1523,7 @@ static int cyber2000fb_setup(char *options)
1524 * - memory mapped access to the registers 1523 * - memory mapped access to the registers
1525 * - initialised mem_ctl1 and mem_ctl2 appropriately. 1524 * - initialised mem_ctl1 and mem_ctl2 appropriately.
1526 */ 1525 */
1527static int __devinit cyberpro_common_probe(struct cfb_info *cfb) 1526static int cyberpro_common_probe(struct cfb_info *cfb)
1528{ 1527{
1529 u_long smem_size; 1528 u_long smem_size;
1530 u_int h_sync, v_sync; 1529 u_int h_sync, v_sync;
@@ -1615,7 +1614,7 @@ failed:
1615 return err; 1614 return err;
1616} 1615}
1617 1616
1618static void __devexit cyberpro_common_remove(struct cfb_info *cfb) 1617static void cyberpro_common_remove(struct cfb_info *cfb)
1619{ 1618{
1620 unregister_framebuffer(&cfb->fb); 1619 unregister_framebuffer(&cfb->fb);
1621#ifdef CONFIG_FB_CYBER2000_DDC 1620#ifdef CONFIG_FB_CYBER2000_DDC
@@ -1646,7 +1645,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
1646 1645
1647#include <mach/framebuffer.h> 1646#include <mach/framebuffer.h>
1648 1647
1649static int __devinit cyberpro_vl_probe(void) 1648static int cyberpro_vl_probe(void)
1650{ 1649{
1651 struct cfb_info *cfb; 1650 struct cfb_info *cfb;
1652 int err = -ENOMEM; 1651 int err = -ENOMEM;
@@ -1780,8 +1779,8 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb)
1780 return 0; 1779 return 0;
1781} 1780}
1782 1781
1783static int __devinit 1782static int cyberpro_pci_probe(struct pci_dev *dev,
1784cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 1783 const struct pci_device_id *id)
1785{ 1784{
1786 struct cfb_info *cfb; 1785 struct cfb_info *cfb;
1787 char name[16]; 1786 char name[16];
@@ -1863,7 +1862,7 @@ failed_release:
1863 return err; 1862 return err;
1864} 1863}
1865 1864
1866static void __devexit cyberpro_pci_remove(struct pci_dev *dev) 1865static void cyberpro_pci_remove(struct pci_dev *dev)
1867{ 1866{
1868 struct cfb_info *cfb = pci_get_drvdata(dev); 1867 struct cfb_info *cfb = pci_get_drvdata(dev);
1869 1868
@@ -1923,7 +1922,7 @@ MODULE_DEVICE_TABLE(pci, cyberpro_pci_table);
1923static struct pci_driver cyberpro_driver = { 1922static struct pci_driver cyberpro_driver = {
1924 .name = "CyberPro", 1923 .name = "CyberPro",
1925 .probe = cyberpro_pci_probe, 1924 .probe = cyberpro_pci_probe,
1926 .remove = __devexit_p(cyberpro_pci_remove), 1925 .remove = cyberpro_pci_remove,
1927 .suspend = cyberpro_pci_suspend, 1926 .suspend = cyberpro_pci_suspend,
1928 .resume = cyberpro_pci_resume, 1927 .resume = cyberpro_pci_resume,
1929 .id_table = cyberpro_pci_table 1928 .id_table = cyberpro_pci_table
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 46534e00fe01..0810939936f4 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -185,7 +185,7 @@ struct da8xx_fb_par {
185}; 185};
186 186
187/* Variable Screen Information */ 187/* Variable Screen Information */
188static struct fb_var_screeninfo da8xx_fb_var __devinitdata = { 188static struct fb_var_screeninfo da8xx_fb_var = {
189 .xoffset = 0, 189 .xoffset = 0,
190 .yoffset = 0, 190 .yoffset = 0,
191 .transp = {0, 0, 0}, 191 .transp = {0, 0, 0},
@@ -202,7 +202,7 @@ static struct fb_var_screeninfo da8xx_fb_var __devinitdata = {
202 .vmode = FB_VMODE_NONINTERLACED 202 .vmode = FB_VMODE_NONINTERLACED
203}; 203};
204 204
205static struct fb_fix_screeninfo da8xx_fb_fix __devinitdata = { 205static struct fb_fix_screeninfo da8xx_fb_fix = {
206 .id = "DA8xx FB Drv", 206 .id = "DA8xx FB Drv",
207 .type = FB_TYPE_PACKED_PIXELS, 207 .type = FB_TYPE_PACKED_PIXELS,
208 .type_aux = 0, 208 .type_aux = 0,
@@ -993,7 +993,7 @@ static inline void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
993} 993}
994#endif 994#endif
995 995
996static int __devexit fb_remove(struct platform_device *dev) 996static int fb_remove(struct platform_device *dev)
997{ 997{
998 struct fb_info *info = dev_get_drvdata(&dev->dev); 998 struct fb_info *info = dev_get_drvdata(&dev->dev);
999 999
@@ -1211,7 +1211,7 @@ static unsigned int da8xxfb_pixel_clk_period(struct da8xx_fb_par *par)
1211 return pix_clk_period_picosec; 1211 return pix_clk_period_picosec;
1212} 1212}
1213 1213
1214static int __devinit fb_probe(struct platform_device *device) 1214static int fb_probe(struct platform_device *device)
1215{ 1215{
1216 struct da8xx_lcdc_platform_data *fb_pdata = 1216 struct da8xx_lcdc_platform_data *fb_pdata =
1217 device->dev.platform_data; 1217 device->dev.platform_data;
@@ -1580,7 +1580,7 @@ static int fb_resume(struct platform_device *dev)
1580 1580
1581static struct platform_driver da8xx_fb_driver = { 1581static struct platform_driver da8xx_fb_driver = {
1582 .probe = fb_probe, 1582 .probe = fb_probe,
1583 .remove = __devexit_p(fb_remove), 1583 .remove = fb_remove,
1584 .suspend = fb_suspend, 1584 .suspend = fb_suspend,
1585 .resume = fb_resume, 1585 .resume = fb_resume,
1586 .driver = { 1586 .driver = {
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 49e3dda1a361..3526899da61b 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -115,7 +115,7 @@ static struct fb_ops dn_fb_ops = {
115 .fb_imageblit = cfb_imageblit, 115 .fb_imageblit = cfb_imageblit,
116}; 116};
117 117
118struct fb_var_screeninfo dnfb_var __devinitdata = { 118struct fb_var_screeninfo dnfb_var = {
119 .xres = 1280, 119 .xres = 1280,
120 .yres = 1024, 120 .yres = 1024,
121 .xres_virtual = 2048, 121 .xres_virtual = 2048,
@@ -126,7 +126,7 @@ struct fb_var_screeninfo dnfb_var __devinitdata = {
126 .vmode = FB_VMODE_NONINTERLACED, 126 .vmode = FB_VMODE_NONINTERLACED,
127}; 127};
128 128
129static struct fb_fix_screeninfo dnfb_fix __devinitdata = { 129static struct fb_fix_screeninfo dnfb_fix = {
130 .id = "Apollo Mono", 130 .id = "Apollo Mono",
131 .smem_start = (FRAME_BUFFER_START + IO_BASE), 131 .smem_start = (FRAME_BUFFER_START + IO_BASE),
132 .smem_len = FRAME_BUFFER_LEN, 132 .smem_len = FRAME_BUFFER_LEN,
@@ -224,7 +224,7 @@ void dnfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
224 * Initialization 224 * Initialization
225 */ 225 */
226 226
227static int __devinit dnfb_probe(struct platform_device *dev) 227static int dnfb_probe(struct platform_device *dev)
228{ 228{
229 struct fb_info *info; 229 struct fb_info *info;
230 int err = 0; 230 int err = 0;
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index 932abaa58a89..50fe668c6172 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -20,7 +20,7 @@ static bool request_mem_succeeded = false;
20 20
21static struct pci_dev *default_vga; 21static struct pci_dev *default_vga;
22 22
23static struct fb_var_screeninfo efifb_defined __devinitdata = { 23static struct fb_var_screeninfo efifb_defined = {
24 .activate = FB_ACTIVATE_NOW, 24 .activate = FB_ACTIVATE_NOW,
25 .height = -1, 25 .height = -1,
26 .width = -1, 26 .width = -1,
@@ -31,7 +31,7 @@ static struct fb_var_screeninfo efifb_defined __devinitdata = {
31 .vmode = FB_VMODE_NONINTERLACED, 31 .vmode = FB_VMODE_NONINTERLACED,
32}; 32};
33 33
34static struct fb_fix_screeninfo efifb_fix __devinitdata = { 34static struct fb_fix_screeninfo efifb_fix = {
35 .id = "EFI VGA", 35 .id = "EFI VGA",
36 .type = FB_TYPE_PACKED_PIXELS, 36 .type = FB_TYPE_PACKED_PIXELS,
37 .accel = FB_ACCEL_NONE, 37 .accel = FB_ACCEL_NONE,
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index 755ef3e65caf..3f2519d30715 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -484,7 +484,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
484 info->screen_base, info->fix.smem_start); 484 info->screen_base, info->fix.smem_start);
485} 485}
486 486
487static int __devinit ep93xxfb_probe(struct platform_device *pdev) 487static int ep93xxfb_probe(struct platform_device *pdev)
488{ 488{
489 struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data; 489 struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
490 struct fb_info *info; 490 struct fb_info *info;
@@ -599,7 +599,7 @@ failed_cmap:
599 return err; 599 return err;
600} 600}
601 601
602static int __devexit ep93xxfb_remove(struct platform_device *pdev) 602static int ep93xxfb_remove(struct platform_device *pdev)
603{ 603{
604 struct fb_info *info = platform_get_drvdata(pdev); 604 struct fb_info *info = platform_get_drvdata(pdev);
605 struct ep93xx_fbi *fbi = info->par; 605 struct ep93xx_fbi *fbi = info->par;
@@ -620,14 +620,14 @@ static int __devexit ep93xxfb_remove(struct platform_device *pdev)
620 620
621static struct platform_driver ep93xxfb_driver = { 621static struct platform_driver ep93xxfb_driver = {
622 .probe = ep93xxfb_probe, 622 .probe = ep93xxfb_probe,
623 .remove = __devexit_p(ep93xxfb_remove), 623 .remove = ep93xxfb_remove,
624 .driver = { 624 .driver = {
625 .name = "ep93xx-fb", 625 .name = "ep93xx-fb",
626 .owner = THIS_MODULE, 626 .owner = THIS_MODULE,
627 }, 627 },
628}; 628};
629 629
630static int __devinit ep93xxfb_init(void) 630static int ep93xxfb_init(void)
631{ 631{
632 return platform_driver_register(&ep93xxfb_driver); 632 return platform_driver_register(&ep93xxfb_driver);
633} 633}
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 28fd686c6b81..4ef18e2e90cc 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -1033,7 +1033,7 @@ static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
1033} 1033}
1034#endif /* CONFIG_OF */ 1034#endif /* CONFIG_OF */
1035 1035
1036static int __devinit exynos_dp_probe(struct platform_device *pdev) 1036static int exynos_dp_probe(struct platform_device *pdev)
1037{ 1037{
1038 struct resource *res; 1038 struct resource *res;
1039 struct exynos_dp_device *dp; 1039 struct exynos_dp_device *dp;
@@ -1114,7 +1114,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
1114 return 0; 1114 return 0;
1115} 1115}
1116 1116
1117static int __devexit exynos_dp_remove(struct platform_device *pdev) 1117static int exynos_dp_remove(struct platform_device *pdev)
1118{ 1118{
1119 struct exynos_dp_platdata *pdata = pdev->dev.platform_data; 1119 struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
1120 struct exynos_dp_device *dp = platform_get_drvdata(pdev); 1120 struct exynos_dp_device *dp = platform_get_drvdata(pdev);
@@ -1195,7 +1195,7 @@ MODULE_DEVICE_TABLE(of, exynos_dp_match);
1195 1195
1196static struct platform_driver exynos_dp_driver = { 1196static struct platform_driver exynos_dp_driver = {
1197 .probe = exynos_dp_probe, 1197 .probe = exynos_dp_probe,
1198 .remove = __devexit_p(exynos_dp_remove), 1198 .remove = exynos_dp_remove,
1199 .driver = { 1199 .driver = {
1200 .name = "exynos-dp", 1200 .name = "exynos-dp",
1201 .owner = THIS_MODULE, 1201 .owner = THIS_MODULE,
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 07d70a3a628b..4a17cdccef34 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -490,7 +490,7 @@ err_platform_get_irq:
490 return ret; 490 return ret;
491} 491}
492 492
493static int __devexit exynos_mipi_dsi_remove(struct platform_device *pdev) 493static int exynos_mipi_dsi_remove(struct platform_device *pdev)
494{ 494{
495 struct mipi_dsim_device *dsim = platform_get_drvdata(pdev); 495 struct mipi_dsim_device *dsim = platform_get_drvdata(pdev);
496 struct mipi_dsim_ddi *dsim_ddi, *next; 496 struct mipi_dsim_ddi *dsim_ddi, *next;
@@ -595,7 +595,7 @@ static const struct dev_pm_ops exynos_mipi_dsi_pm_ops = {
595 595
596static struct platform_driver exynos_mipi_dsi_driver = { 596static struct platform_driver exynos_mipi_dsi_driver = {
597 .probe = exynos_mipi_dsi_probe, 597 .probe = exynos_mipi_dsi_probe,
598 .remove = __devexit_p(exynos_mipi_dsi_remove), 598 .remove = exynos_mipi_dsi_remove,
599 .driver = { 599 .driver = {
600 .name = "exynos-mipi-dsim", 600 .name = "exynos-mipi-dsim",
601 .owner = THIS_MODULE, 601 .owner = THIS_MODULE,
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 14102a3f70f5..6d2744794dd1 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -893,7 +893,7 @@ static void ffb_init_fix(struct fb_info *info)
893 info->fix.accel = FB_ACCEL_SUN_CREATOR; 893 info->fix.accel = FB_ACCEL_SUN_CREATOR;
894} 894}
895 895
896static int __devinit ffb_probe(struct platform_device *op) 896static int ffb_probe(struct platform_device *op)
897{ 897{
898 struct device_node *dp = op->dev.of_node; 898 struct device_node *dp = op->dev.of_node;
899 struct ffb_fbc __iomem *fbc; 899 struct ffb_fbc __iomem *fbc;
@@ -1022,7 +1022,7 @@ out_err:
1022 return err; 1022 return err;
1023} 1023}
1024 1024
1025static int __devexit ffb_remove(struct platform_device *op) 1025static int ffb_remove(struct platform_device *op)
1026{ 1026{
1027 struct fb_info *info = dev_get_drvdata(&op->dev); 1027 struct fb_info *info = dev_get_drvdata(&op->dev);
1028 struct ffb_par *par = info->par; 1028 struct ffb_par *par = info->par;
@@ -1058,7 +1058,7 @@ static struct platform_driver ffb_driver = {
1058 .of_match_table = ffb_match, 1058 .of_match_table = ffb_match,
1059 }, 1059 },
1060 .probe = ffb_probe, 1060 .probe = ffb_probe,
1061 .remove = __devexit_p(ffb_remove), 1061 .remove = ffb_remove,
1062}; 1062};
1063 1063
1064static int __init ffb_init(void) 1064static int __init ffb_init(void)
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index d0533b7aad79..c99c9671302b 100644
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -127,7 +127,7 @@
127 127
128static volatile unsigned char *fm2fb_reg; 128static volatile unsigned char *fm2fb_reg;
129 129
130static struct fb_fix_screeninfo fb_fix __devinitdata = { 130static struct fb_fix_screeninfo fb_fix = {
131 .smem_len = FRAMEMASTER_REG, 131 .smem_len = FRAMEMASTER_REG,
132 .type = FB_TYPE_PACKED_PIXELS, 132 .type = FB_TYPE_PACKED_PIXELS,
133 .visual = FB_VISUAL_TRUECOLOR, 133 .visual = FB_VISUAL_TRUECOLOR,
@@ -136,12 +136,12 @@ static struct fb_fix_screeninfo fb_fix __devinitdata = {
136 .accel = FB_ACCEL_NONE, 136 .accel = FB_ACCEL_NONE,
137}; 137};
138 138
139static int fm2fb_mode __devinitdata = -1; 139static int fm2fb_mode = -1;
140 140
141#define FM2FB_MODE_PAL 0 141#define FM2FB_MODE_PAL 0
142#define FM2FB_MODE_NTSC 1 142#define FM2FB_MODE_NTSC 1
143 143
144static struct fb_var_screeninfo fb_var_modes[] __devinitdata = { 144static struct fb_var_screeninfo fb_var_modes[] = {
145 { 145 {
146 /* 768 x 576, 32 bpp (PAL) */ 146 /* 768 x 576, 32 bpp (PAL) */
147 768, 576, 768, 576, 0, 0, 32, 0, 147 768, 576, 768, 576, 0, 0, 32, 0,
@@ -211,10 +211,9 @@ static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
211 * Initialisation 211 * Initialisation
212 */ 212 */
213 213
214static int __devinit fm2fb_probe(struct zorro_dev *z, 214static int fm2fb_probe(struct zorro_dev *z, const struct zorro_device_id *id);
215 const struct zorro_device_id *id);
216 215
217static struct zorro_device_id fm2fb_devices[] __devinitdata = { 216static struct zorro_device_id fm2fb_devices[] = {
218 { ZORRO_PROD_BSC_FRAMEMASTER_II }, 217 { ZORRO_PROD_BSC_FRAMEMASTER_II },
219 { ZORRO_PROD_HELFRICH_RAINBOW_II }, 218 { ZORRO_PROD_HELFRICH_RAINBOW_II },
220 { 0 } 219 { 0 }
@@ -227,8 +226,7 @@ static struct zorro_driver fm2fb_driver = {
227 .probe = fm2fb_probe, 226 .probe = fm2fb_probe,
228}; 227};
229 228
230static int __devinit fm2fb_probe(struct zorro_dev *z, 229static int fm2fb_probe(struct zorro_dev *z, const struct zorro_device_id *id)
231 const struct zorro_device_id *id)
232{ 230{
233 struct fb_info *info; 231 struct fb_info *info;
234 unsigned long *ptr; 232 unsigned long *ptr;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index d3fc92eaee89..19cfd7a92563 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -55,7 +55,7 @@
55 * order if increasing resolution and frequency. The 320x240-60 mode is 55 * order if increasing resolution and frequency. The 320x240-60 mode is
56 * the initial AOI for the second and third planes. 56 * the initial AOI for the second and third planes.
57 */ 57 */
58static struct fb_videomode __devinitdata fsl_diu_mode_db[] = { 58static struct fb_videomode fsl_diu_mode_db[] = {
59 { 59 {
60 .refresh = 60, 60 .refresh = 60,
61 .xres = 1024, 61 .xres = 1024,
@@ -1307,7 +1307,7 @@ static struct fb_ops fsl_diu_ops = {
1307 .fb_release = fsl_diu_release, 1307 .fb_release = fsl_diu_release,
1308}; 1308};
1309 1309
1310static int __devinit install_fb(struct fb_info *info) 1310static int install_fb(struct fb_info *info)
1311{ 1311{
1312 int rc; 1312 int rc;
1313 struct mfb_info *mfbi = info->par; 1313 struct mfb_info *mfbi = info->par;
@@ -1518,7 +1518,7 @@ static ssize_t show_monitor(struct device *device,
1518 return 0; 1518 return 0;
1519} 1519}
1520 1520
1521static int __devinit fsl_diu_probe(struct platform_device *pdev) 1521static int fsl_diu_probe(struct platform_device *pdev)
1522{ 1522{
1523 struct device_node *np = pdev->dev.of_node; 1523 struct device_node *np = pdev->dev.of_node;
1524 struct mfb_info *mfbi; 1524 struct mfb_info *mfbi;
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 3dad31975db8..bda5e3941510 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -91,10 +91,10 @@ static uint32_t pseudo_palette[16];
91static uint32_t gbe_cmap[256]; 91static uint32_t gbe_cmap[256];
92static int gbe_turned_on; /* 0 turned off, 1 turned on */ 92static int gbe_turned_on; /* 0 turned off, 1 turned on */
93 93
94static char *mode_option __devinitdata = NULL; 94static char *mode_option = NULL;
95 95
96/* default CRT mode */ 96/* default CRT mode */
97static struct fb_var_screeninfo default_var_CRT __devinitdata = { 97static struct fb_var_screeninfo default_var_CRT = {
98 /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */ 98 /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
99 .xres = 640, 99 .xres = 640,
100 .yres = 480, 100 .yres = 480,
@@ -125,7 +125,7 @@ static struct fb_var_screeninfo default_var_CRT __devinitdata = {
125}; 125};
126 126
127/* default LCD mode */ 127/* default LCD mode */
128static struct fb_var_screeninfo default_var_LCD __devinitdata = { 128static struct fb_var_screeninfo default_var_LCD = {
129 /* 1600x1024, 8 bpp */ 129 /* 1600x1024, 8 bpp */
130 .xres = 1600, 130 .xres = 1600,
131 .yres = 1024, 131 .yres = 1024,
@@ -157,7 +157,7 @@ static struct fb_var_screeninfo default_var_LCD __devinitdata = {
157 157
158/* default modedb mode */ 158/* default modedb mode */
159/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */ 159/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
160static struct fb_videomode default_mode_CRT __devinitdata = { 160static struct fb_videomode default_mode_CRT = {
161 .refresh = 60, 161 .refresh = 60,
162 .xres = 640, 162 .xres = 640,
163 .yres = 480, 163 .yres = 480,
@@ -172,7 +172,7 @@ static struct fb_videomode default_mode_CRT __devinitdata = {
172 .vmode = FB_VMODE_NONINTERLACED, 172 .vmode = FB_VMODE_NONINTERLACED,
173}; 173};
174/* 1600x1024 SGI flatpanel 1600sw */ 174/* 1600x1024 SGI flatpanel 1600sw */
175static struct fb_videomode default_mode_LCD __devinitdata = { 175static struct fb_videomode default_mode_LCD = {
176 /* 1600x1024, 8 bpp */ 176 /* 1600x1024, 8 bpp */
177 .xres = 1600, 177 .xres = 1600,
178 .yres = 1024, 178 .yres = 1024,
@@ -186,8 +186,8 @@ static struct fb_videomode default_mode_LCD __devinitdata = {
186 .vmode = FB_VMODE_NONINTERLACED, 186 .vmode = FB_VMODE_NONINTERLACED,
187}; 187};
188 188
189static struct fb_videomode *default_mode __devinitdata = &default_mode_CRT; 189static struct fb_videomode *default_mode = &default_mode_CRT;
190static struct fb_var_screeninfo *default_var __devinitdata = &default_var_CRT; 190static struct fb_var_screeninfo *default_var = &default_var_CRT;
191 191
192static int flat_panel_enabled = 0; 192static int flat_panel_enabled = 0;
193 193
@@ -1082,7 +1082,7 @@ static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *at
1082 1082
1083static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL); 1083static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL);
1084 1084
1085static void __devexit gbefb_remove_sysfs(struct device *dev) 1085static void gbefb_remove_sysfs(struct device *dev)
1086{ 1086{
1087 device_remove_file(dev, &dev_attr_size); 1087 device_remove_file(dev, &dev_attr_size);
1088 device_remove_file(dev, &dev_attr_revision); 1088 device_remove_file(dev, &dev_attr_revision);
@@ -1098,7 +1098,7 @@ static void gbefb_create_sysfs(struct device *dev)
1098 * Initialization 1098 * Initialization
1099 */ 1099 */
1100 1100
1101static int __devinit gbefb_setup(char *options) 1101static int gbefb_setup(char *options)
1102{ 1102{
1103 char *this_opt; 1103 char *this_opt;
1104 1104
@@ -1129,7 +1129,7 @@ static int __devinit gbefb_setup(char *options)
1129 return 0; 1129 return 0;
1130} 1130}
1131 1131
1132static int __devinit gbefb_probe(struct platform_device *p_dev) 1132static int gbefb_probe(struct platform_device *p_dev)
1133{ 1133{
1134 int i, ret = 0; 1134 int i, ret = 0;
1135 struct fb_info *info; 1135 struct fb_info *info;
@@ -1254,7 +1254,7 @@ out_release_framebuffer:
1254 return ret; 1254 return ret;
1255} 1255}
1256 1256
1257static int __devexit gbefb_remove(struct platform_device* p_dev) 1257static int gbefb_remove(struct platform_device* p_dev)
1258{ 1258{
1259 struct fb_info *info = platform_get_drvdata(p_dev); 1259 struct fb_info *info = platform_get_drvdata(p_dev);
1260 1260
@@ -1273,7 +1273,7 @@ static int __devexit gbefb_remove(struct platform_device* p_dev)
1273 1273
1274static struct platform_driver gbefb_driver = { 1274static struct platform_driver gbefb_driver = {
1275 .probe = gbefb_probe, 1275 .probe = gbefb_probe,
1276 .remove = __devexit_p(gbefb_remove), 1276 .remove = gbefb_remove,
1277 .driver = { 1277 .driver = {
1278 .name = "gbefb", 1278 .name = "gbefb",
1279 }, 1279 },
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 265c5ed59ade..ebbaada7b941 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -29,7 +29,7 @@ static int crt_option = 1;
29static char panel_option[32] = ""; 29static char panel_option[32] = "";
30 30
31/* Modes relevant to the GX1 (taken from modedb.c) */ 31/* Modes relevant to the GX1 (taken from modedb.c) */
32static const struct fb_videomode __devinitconst gx1_modedb[] = { 32static const struct fb_videomode gx1_modedb[] = {
33 /* 640x480-60 VESA */ 33 /* 640x480-60 VESA */
34 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, 34 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
35 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 35 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info)
195 return par->vid_ops->blank_display(info, blank_mode); 195 return par->vid_ops->blank_display(info, blank_mode);
196} 196}
197 197
198static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev) 198static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
199{ 199{
200 struct geodefb_par *par = info->par; 200 struct geodefb_par *par = info->par;
201 unsigned gx_base; 201 unsigned gx_base;
@@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = {
268 .fb_imageblit = cfb_imageblit, 268 .fb_imageblit = cfb_imageblit,
269}; 269};
270 270
271static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev) 271static struct fb_info *gx1fb_init_fbinfo(struct device *dev)
272{ 272{
273 struct geodefb_par *par; 273 struct geodefb_par *par;
274 struct fb_info *info; 274 struct fb_info *info;
@@ -318,7 +318,7 @@ static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)
318 return info; 318 return info;
319} 319}
320 320
321static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 321static int gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
322{ 322{
323 struct geodefb_par *par; 323 struct geodefb_par *par;
324 struct fb_info *info; 324 struct fb_info *info;
@@ -382,7 +382,7 @@ static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_i
382 return ret; 382 return ret;
383} 383}
384 384
385static void __devexit gx1fb_remove(struct pci_dev *pdev) 385static void gx1fb_remove(struct pci_dev *pdev)
386{ 386{
387 struct fb_info *info = pci_get_drvdata(pdev); 387 struct fb_info *info = pci_get_drvdata(pdev);
388 struct geodefb_par *par = info->par; 388 struct geodefb_par *par = info->par;
@@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = {
441 .name = "gx1fb", 441 .name = "gx1fb",
442 .id_table = gx1fb_id_table, 442 .id_table = gx1fb_id_table,
443 .probe = gx1fb_probe, 443 .probe = gx1fb_probe,
444 .remove = __devexit_p(gx1fb_remove), 444 .remove = gx1fb_remove,
445}; 445};
446 446
447static int __init gx1fb_init(void) 447static int __init gx1fb_init(void)
@@ -456,7 +456,7 @@ static int __init gx1fb_init(void)
456 return pci_register_driver(&gx1fb_driver); 456 return pci_register_driver(&gx1fb_driver);
457} 457}
458 458
459static void __devexit gx1fb_cleanup(void) 459static void gx1fb_cleanup(void)
460{ 460{
461 pci_unregister_driver(&gx1fb_driver); 461 pci_unregister_driver(&gx1fb_driver);
462} 462}
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index b4f19db9bb54..19f0c1add747 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -40,7 +40,7 @@ static int vram;
40static int vt_switch; 40static int vt_switch;
41 41
42/* Modes relevant to the GX (taken from modedb.c) */ 42/* Modes relevant to the GX (taken from modedb.c) */
43static struct fb_videomode gx_modedb[] __devinitdata = { 43static struct fb_videomode gx_modedb[] = {
44 /* 640x480-60 VESA */ 44 /* 640x480-60 VESA */
45 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, 45 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
46 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 46 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -110,15 +110,14 @@ static struct fb_videomode gx_modedb[] __devinitdata = {
110#ifdef CONFIG_OLPC 110#ifdef CONFIG_OLPC
111#include <asm/olpc.h> 111#include <asm/olpc.h>
112 112
113static struct fb_videomode gx_dcon_modedb[] __devinitdata = { 113static struct fb_videomode gx_dcon_modedb[] = {
114 /* The only mode the DCON has is 1200x900 */ 114 /* The only mode the DCON has is 1200x900 */
115 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, 115 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
116 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 116 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
117 FB_VMODE_NONINTERLACED, 0 } 117 FB_VMODE_NONINTERLACED, 0 }
118}; 118};
119 119
120static void __devinit get_modedb(struct fb_videomode **modedb, 120static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
121 unsigned int *size)
122{ 121{
123 if (olpc_has_dcon()) { 122 if (olpc_has_dcon()) {
124 *modedb = (struct fb_videomode *) gx_dcon_modedb; 123 *modedb = (struct fb_videomode *) gx_dcon_modedb;
@@ -130,8 +129,7 @@ static void __devinit get_modedb(struct fb_videomode **modedb,
130} 129}
131 130
132#else 131#else
133static void __devinit get_modedb(struct fb_videomode **modedb, 132static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
134 unsigned int *size)
135{ 133{
136 *modedb = (struct fb_videomode *) gx_modedb; 134 *modedb = (struct fb_videomode *) gx_modedb;
137 *size = ARRAY_SIZE(gx_modedb); 135 *size = ARRAY_SIZE(gx_modedb);
@@ -228,8 +226,7 @@ static int gxfb_blank(int blank_mode, struct fb_info *info)
228 return gx_blank_display(info, blank_mode); 226 return gx_blank_display(info, blank_mode);
229} 227}
230 228
231static int __devinit gxfb_map_video_memory(struct fb_info *info, 229static int gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
232 struct pci_dev *dev)
233{ 230{
234 struct gxfb_par *par = info->par; 231 struct gxfb_par *par = info->par;
235 int ret; 232 int ret;
@@ -293,7 +290,7 @@ static struct fb_ops gxfb_ops = {
293 .fb_imageblit = cfb_imageblit, 290 .fb_imageblit = cfb_imageblit,
294}; 291};
295 292
296static struct fb_info *__devinit gxfb_init_fbinfo(struct device *dev) 293static struct fb_info *gxfb_init_fbinfo(struct device *dev)
297{ 294{
298 struct gxfb_par *par; 295 struct gxfb_par *par;
299 struct fb_info *info; 296 struct fb_info *info;
@@ -374,8 +371,7 @@ static int gxfb_resume(struct pci_dev *pdev)
374} 371}
375#endif 372#endif
376 373
377static int __devinit gxfb_probe(struct pci_dev *pdev, 374static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
378 const struct pci_device_id *id)
379{ 375{
380 struct gxfb_par *par; 376 struct gxfb_par *par;
381 struct fb_info *info; 377 struct fb_info *info;
@@ -455,7 +451,7 @@ static int __devinit gxfb_probe(struct pci_dev *pdev,
455 return ret; 451 return ret;
456} 452}
457 453
458static void __devexit gxfb_remove(struct pci_dev *pdev) 454static void gxfb_remove(struct pci_dev *pdev)
459{ 455{
460 struct fb_info *info = pci_get_drvdata(pdev); 456 struct fb_info *info = pci_get_drvdata(pdev);
461 struct gxfb_par *par = info->par; 457 struct gxfb_par *par = info->par;
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 416851ca8754..4dd7b5566962 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -35,7 +35,7 @@ static int vt_switch;
35 * we try to make it something sane - 640x480-60 is sane 35 * we try to make it something sane - 640x480-60 is sane
36 */ 36 */
37 37
38static struct fb_videomode geode_modedb[] __devinitdata = { 38static struct fb_videomode geode_modedb[] = {
39 /* 640x480-60 */ 39 /* 640x480-60 */
40 { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2, 40 { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2,
41 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 41 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
@@ -219,15 +219,14 @@ static struct fb_videomode geode_modedb[] __devinitdata = {
219#ifdef CONFIG_OLPC 219#ifdef CONFIG_OLPC
220#include <asm/olpc.h> 220#include <asm/olpc.h>
221 221
222static struct fb_videomode olpc_dcon_modedb[] __devinitdata = { 222static struct fb_videomode olpc_dcon_modedb[] = {
223 /* The only mode the DCON has is 1200x900 */ 223 /* The only mode the DCON has is 1200x900 */
224 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, 224 { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
225 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 225 FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
226 FB_VMODE_NONINTERLACED, 0 } 226 FB_VMODE_NONINTERLACED, 0 }
227}; 227};
228 228
229static void __devinit get_modedb(struct fb_videomode **modedb, 229static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
230 unsigned int *size)
231{ 230{
232 if (olpc_has_dcon()) { 231 if (olpc_has_dcon()) {
233 *modedb = (struct fb_videomode *) olpc_dcon_modedb; 232 *modedb = (struct fb_videomode *) olpc_dcon_modedb;
@@ -239,8 +238,7 @@ static void __devinit get_modedb(struct fb_videomode **modedb,
239} 238}
240 239
241#else 240#else
242static void __devinit get_modedb(struct fb_videomode **modedb, 241static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
243 unsigned int *size)
244{ 242{
245 *modedb = (struct fb_videomode *) geode_modedb; 243 *modedb = (struct fb_videomode *) geode_modedb;
246 *size = ARRAY_SIZE(geode_modedb); 244 *size = ARRAY_SIZE(geode_modedb);
@@ -336,8 +334,7 @@ static int lxfb_blank(int blank_mode, struct fb_info *info)
336} 334}
337 335
338 336
339static int __devinit lxfb_map_video_memory(struct fb_info *info, 337static int lxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
340 struct pci_dev *dev)
341{ 338{
342 struct lxfb_par *par = info->par; 339 struct lxfb_par *par = info->par;
343 int ret; 340 int ret;
@@ -414,7 +411,7 @@ static struct fb_ops lxfb_ops = {
414 .fb_imageblit = cfb_imageblit, 411 .fb_imageblit = cfb_imageblit,
415}; 412};
416 413
417static struct fb_info * __devinit lxfb_init_fbinfo(struct device *dev) 414static struct fb_info *lxfb_init_fbinfo(struct device *dev)
418{ 415{
419 struct lxfb_par *par; 416 struct lxfb_par *par;
420 struct fb_info *info; 417 struct fb_info *info;
@@ -498,8 +495,7 @@ static int lxfb_resume(struct pci_dev *pdev)
498#define lxfb_resume NULL 495#define lxfb_resume NULL
499#endif 496#endif
500 497
501static int __devinit lxfb_probe(struct pci_dev *pdev, 498static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
502 const struct pci_device_id *id)
503{ 499{
504 struct lxfb_par *par; 500 struct lxfb_par *par;
505 struct fb_info *info; 501 struct fb_info *info;
@@ -590,7 +586,7 @@ err:
590 return ret; 586 return ret;
591} 587}
592 588
593static void __devexit lxfb_remove(struct pci_dev *pdev) 589static void lxfb_remove(struct pci_dev *pdev)
594{ 590{
595 struct fb_info *info = pci_get_drvdata(pdev); 591 struct fb_info *info = pci_get_drvdata(pdev);
596 struct lxfb_par *par = info->par; 592 struct lxfb_par *par = info->par;
diff --git a/drivers/video/grvga.c b/drivers/video/grvga.c
index 5245f9a71892..861109e7de1b 100644
--- a/drivers/video/grvga.c
+++ b/drivers/video/grvga.c
@@ -70,7 +70,7 @@ static const struct fb_videomode grvga_modedb[] = {
70 } 70 }
71 }; 71 };
72 72
73static struct fb_fix_screeninfo grvga_fix __devinitdata = { 73static struct fb_fix_screeninfo grvga_fix = {
74 .id = "AG SVGACTRL", 74 .id = "AG SVGACTRL",
75 .type = FB_TYPE_PACKED_PIXELS, 75 .type = FB_TYPE_PACKED_PIXELS,
76 .visual = FB_VISUAL_PSEUDOCOLOR, 76 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -267,8 +267,8 @@ static struct fb_ops grvga_ops = {
267 .fb_imageblit = cfb_imageblit 267 .fb_imageblit = cfb_imageblit
268}; 268};
269 269
270static int __devinit grvga_parse_custom(char *options, 270static int grvga_parse_custom(char *options,
271 struct fb_var_screeninfo *screendata) 271 struct fb_var_screeninfo *screendata)
272{ 272{
273 char *this_opt; 273 char *this_opt;
274 int count = 0; 274 int count = 0;
@@ -329,7 +329,7 @@ static int __devinit grvga_parse_custom(char *options,
329 return 0; 329 return 0;
330} 330}
331 331
332static int __devinit grvga_probe(struct platform_device *dev) 332static int grvga_probe(struct platform_device *dev)
333{ 333{
334 struct fb_info *info; 334 struct fb_info *info;
335 int retval = -ENOMEM; 335 int retval = -ENOMEM;
@@ -512,7 +512,7 @@ free_fb:
512 return retval; 512 return retval;
513} 513}
514 514
515static int __devexit grvga_remove(struct platform_device *device) 515static int grvga_remove(struct platform_device *device)
516{ 516{
517 struct fb_info *info = dev_get_drvdata(&device->dev); 517 struct fb_info *info = dev_get_drvdata(&device->dev);
518 struct grvga_par *par = info->par; 518 struct grvga_par *par = info->par;
@@ -554,7 +554,7 @@ static struct platform_driver grvga_driver = {
554 .of_match_table = svgactrl_of_match, 554 .of_match_table = svgactrl_of_match,
555 }, 555 },
556 .probe = grvga_probe, 556 .probe = grvga_probe,
557 .remove = __devexit_p(grvga_remove), 557 .remove = grvga_remove,
558}; 558};
559 559
560 560
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 4bdea6e9bd55..c35663f6a54a 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -159,7 +159,7 @@ struct gxt4500_par {
159static char *mode_option; 159static char *mode_option;
160 160
161/* default mode: 1280x1024 @ 60 Hz, 8 bpp */ 161/* default mode: 1280x1024 @ 60 Hz, 8 bpp */
162static const struct fb_videomode defaultmode __devinitconst = { 162static const struct fb_videomode defaultmode = {
163 .refresh = 60, 163 .refresh = 60,
164 .xres = 1280, 164 .xres = 1280,
165 .yres = 1024, 165 .yres = 1024,
@@ -588,7 +588,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
588 return 0; 588 return 0;
589} 589}
590 590
591static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = { 591static const struct fb_fix_screeninfo gxt4500_fix = {
592 .id = "IBM GXT4500P", 592 .id = "IBM GXT4500P",
593 .type = FB_TYPE_PACKED_PIXELS, 593 .type = FB_TYPE_PACKED_PIXELS,
594 .visual = FB_VISUAL_PSEUDOCOLOR, 594 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -610,8 +610,7 @@ static struct fb_ops gxt4500_ops = {
610}; 610};
611 611
612/* PCI functions */ 612/* PCI functions */
613static int __devinit gxt4500_probe(struct pci_dev *pdev, 613static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
614 const struct pci_device_id *ent)
615{ 614{
616 int err; 615 int err;
617 unsigned long reg_phys, fb_phys; 616 unsigned long reg_phys, fb_phys;
@@ -720,7 +719,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
720 return -ENODEV; 719 return -ENODEV;
721} 720}
722 721
723static void __devexit gxt4500_remove(struct pci_dev *pdev) 722static void gxt4500_remove(struct pci_dev *pdev)
724{ 723{
725 struct fb_info *info = pci_get_drvdata(pdev); 724 struct fb_info *info = pci_get_drvdata(pdev);
726 struct gxt4500_par *par; 725 struct gxt4500_par *par;
@@ -758,10 +757,10 @@ static struct pci_driver gxt4500_driver = {
758 .name = "gxt4500", 757 .name = "gxt4500",
759 .id_table = gxt4500_pci_tbl, 758 .id_table = gxt4500_pci_tbl,
760 .probe = gxt4500_probe, 759 .probe = gxt4500_probe,
761 .remove = __devexit_p(gxt4500_remove), 760 .remove = gxt4500_remove,
762}; 761};
763 762
764static int __devinit gxt4500_init(void) 763static int gxt4500_init(void)
765{ 764{
766#ifndef MODULE 765#ifndef MODULE
767 if (fb_get_options("gxt4500", &mode_option)) 766 if (fb_get_options("gxt4500", &mode_option))
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index 614251a9af91..59d23181fdb0 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -47,7 +47,7 @@
47#define DPY_W 600 47#define DPY_W 600
48#define DPY_H 800 48#define DPY_H 800
49 49
50static struct fb_fix_screeninfo hecubafb_fix __devinitdata = { 50static struct fb_fix_screeninfo hecubafb_fix = {
51 .id = "hecubafb", 51 .id = "hecubafb",
52 .type = FB_TYPE_PACKED_PIXELS, 52 .type = FB_TYPE_PACKED_PIXELS,
53 .visual = FB_VISUAL_MONO01, 53 .visual = FB_VISUAL_MONO01,
@@ -58,7 +58,7 @@ static struct fb_fix_screeninfo hecubafb_fix __devinitdata = {
58 .accel = FB_ACCEL_NONE, 58 .accel = FB_ACCEL_NONE,
59}; 59};
60 60
61static struct fb_var_screeninfo hecubafb_var __devinitdata = { 61static struct fb_var_screeninfo hecubafb_var = {
62 .xres = DPY_W, 62 .xres = DPY_W,
63 .yres = DPY_H, 63 .yres = DPY_H,
64 .xres_virtual = DPY_W, 64 .xres_virtual = DPY_W,
@@ -211,7 +211,7 @@ static struct fb_deferred_io hecubafb_defio = {
211 .deferred_io = hecubafb_dpy_deferred_io, 211 .deferred_io = hecubafb_dpy_deferred_io,
212}; 212};
213 213
214static int __devinit hecubafb_probe(struct platform_device *dev) 214static int hecubafb_probe(struct platform_device *dev)
215{ 215{
216 struct fb_info *info; 216 struct fb_info *info;
217 struct hecuba_board *board; 217 struct hecuba_board *board;
@@ -280,7 +280,7 @@ err_videomem_alloc:
280 return retval; 280 return retval;
281} 281}
282 282
283static int __devexit hecubafb_remove(struct platform_device *dev) 283static int hecubafb_remove(struct platform_device *dev)
284{ 284{
285 struct fb_info *info = platform_get_drvdata(dev); 285 struct fb_info *info = platform_get_drvdata(dev);
286 286
@@ -299,7 +299,7 @@ static int __devexit hecubafb_remove(struct platform_device *dev)
299 299
300static struct platform_driver hecubafb_driver = { 300static struct platform_driver hecubafb_driver = {
301 .probe = hecubafb_probe, 301 .probe = hecubafb_probe,
302 .remove = __devexit_p(hecubafb_remove), 302 .remove = hecubafb_remove,
303 .driver = { 303 .driver = {
304 .owner = THIS_MODULE, 304 .owner = THIS_MODULE,
305 .name = "hecubafb", 305 .name = "hecubafb",
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index c645f9282650..1e9e2d819d1f 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(hga_reg_lock);
106 106
107/* Framebuffer driver structures */ 107/* Framebuffer driver structures */
108 108
109static struct fb_var_screeninfo hga_default_var __devinitdata = { 109static struct fb_var_screeninfo hga_default_var = {
110 .xres = 720, 110 .xres = 720,
111 .yres = 348, 111 .yres = 348,
112 .xres_virtual = 720, 112 .xres_virtual = 720,
@@ -120,7 +120,7 @@ static struct fb_var_screeninfo hga_default_var __devinitdata = {
120 .width = -1, 120 .width = -1,
121}; 121};
122 122
123static struct fb_fix_screeninfo hga_fix __devinitdata = { 123static struct fb_fix_screeninfo hga_fix = {
124 .id = "HGA", 124 .id = "HGA",
125 .type = FB_TYPE_PACKED_PIXELS, /* (not sure) */ 125 .type = FB_TYPE_PACKED_PIXELS, /* (not sure) */
126 .visual = FB_VISUAL_MONO10, 126 .visual = FB_VISUAL_MONO10,
@@ -276,7 +276,7 @@ static void hga_blank(int blank_mode)
276 spin_unlock_irqrestore(&hga_reg_lock, flags); 276 spin_unlock_irqrestore(&hga_reg_lock, flags);
277} 277}
278 278
279static int __devinit hga_card_detect(void) 279static int hga_card_detect(void)
280{ 280{
281 int count = 0; 281 int count = 0;
282 void __iomem *p, *q; 282 void __iomem *p, *q;
@@ -546,7 +546,7 @@ static struct fb_ops hgafb_ops = {
546 * Initialization 546 * Initialization
547 */ 547 */
548 548
549static int __devinit hgafb_probe(struct platform_device *pdev) 549static int hgafb_probe(struct platform_device *pdev)
550{ 550{
551 struct fb_info *info; 551 struct fb_info *info;
552 552
@@ -592,7 +592,7 @@ static int __devinit hgafb_probe(struct platform_device *pdev)
592 return 0; 592 return 0;
593} 593}
594 594
595static int __devexit hgafb_remove(struct platform_device *pdev) 595static int hgafb_remove(struct platform_device *pdev)
596{ 596{
597 struct fb_info *info = platform_get_drvdata(pdev); 597 struct fb_info *info = platform_get_drvdata(pdev);
598 598
@@ -617,7 +617,7 @@ static int __devexit hgafb_remove(struct platform_device *pdev)
617 617
618static struct platform_driver hgafb_driver = { 618static struct platform_driver hgafb_driver = {
619 .probe = hgafb_probe, 619 .probe = hgafb_probe,
620 .remove = __devexit_p(hgafb_remove), 620 .remove = hgafb_remove,
621 .driver = { 621 .driver = {
622 .name = "hgafb", 622 .name = "hgafb",
623 }, 623 },
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index cfb8d6451014..c2414d6ab646 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -30,14 +30,14 @@
30 30
31#define WIDTH 640 31#define WIDTH 640
32 32
33static struct fb_var_screeninfo hitfb_var __devinitdata = { 33static struct fb_var_screeninfo hitfb_var = {
34 .activate = FB_ACTIVATE_NOW, 34 .activate = FB_ACTIVATE_NOW,
35 .height = -1, 35 .height = -1,
36 .width = -1, 36 .width = -1,
37 .vmode = FB_VMODE_NONINTERLACED, 37 .vmode = FB_VMODE_NONINTERLACED,
38}; 38};
39 39
40static struct fb_fix_screeninfo hitfb_fix __devinitdata = { 40static struct fb_fix_screeninfo hitfb_fix = {
41 .id = "Hitachi HD64461", 41 .id = "Hitachi HD64461",
42 .type = FB_TYPE_PACKED_PIXELS, 42 .type = FB_TYPE_PACKED_PIXELS,
43 .accel = FB_ACCEL_NONE, 43 .accel = FB_ACCEL_NONE,
@@ -324,7 +324,7 @@ static struct fb_ops hitfb_ops = {
324 .fb_imageblit = cfb_imageblit, 324 .fb_imageblit = cfb_imageblit,
325}; 325};
326 326
327static int __devinit hitfb_probe(struct platform_device *dev) 327static int hitfb_probe(struct platform_device *dev)
328{ 328{
329 unsigned short lcdclor, ldr3, ldvndr; 329 unsigned short lcdclor, ldr3, ldvndr;
330 struct fb_info *info; 330 struct fb_info *info;
@@ -417,7 +417,7 @@ err_fb:
417 return ret; 417 return ret;
418} 418}
419 419
420static int __devexit hitfb_remove(struct platform_device *dev) 420static int hitfb_remove(struct platform_device *dev)
421{ 421{
422 struct fb_info *info = platform_get_drvdata(dev); 422 struct fb_info *info = platform_get_drvdata(dev);
423 423
@@ -462,7 +462,7 @@ static const struct dev_pm_ops hitfb_dev_pm_ops = {
462 462
463static struct platform_driver hitfb_driver = { 463static struct platform_driver hitfb_driver = {
464 .probe = hitfb_probe, 464 .probe = hitfb_probe,
465 .remove = __devexit_p(hitfb_remove), 465 .remove = hitfb_remove,
466 .driver = { 466 .driver = {
467 .name = "hitfb", 467 .name = "hitfb",
468 .owner = THIS_MODULE, 468 .owner = THIS_MODULE,
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 7324865f965f..b802f93cef5d 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -206,8 +206,7 @@ static struct fb_ops hpfb_ops = {
206#define HPFB_FBOMSB 0x5d /* Frame buffer offset */ 206#define HPFB_FBOMSB 0x5d /* Frame buffer offset */
207#define HPFB_FBOLSB 0x5f 207#define HPFB_FBOLSB 0x5f
208 208
209static int __devinit hpfb_init_one(unsigned long phys_base, 209static int hpfb_init_one(unsigned long phys_base, unsigned long virt_base)
210 unsigned long virt_base)
211{ 210{
212 unsigned long fboff, fb_width, fb_height, fb_start; 211 unsigned long fboff, fb_width, fb_height, fb_start;
213 int ret; 212 int ret;
@@ -327,7 +326,7 @@ unmap_screen_base:
327/* 326/*
328 * Initialise the framebuffer 327 * Initialise the framebuffer
329 */ 328 */
330static int __devinit hpfb_dio_probe(struct dio_dev * d, const struct dio_device_id * ent) 329static int hpfb_dio_probe(struct dio_dev *d, const struct dio_device_id *ent)
331{ 330{
332 unsigned long paddr, vaddr; 331 unsigned long paddr, vaddr;
333 332
@@ -350,7 +349,7 @@ static int __devinit hpfb_dio_probe(struct dio_dev * d, const struct dio_device_
350 return 0; 349 return 0;
351} 350}
352 351
353static void __devexit hpfb_remove_one(struct dio_dev *d) 352static void hpfb_remove_one(struct dio_dev *d)
354{ 353{
355 unregister_framebuffer(&fb_info); 354 unregister_framebuffer(&fb_info);
356 if (d->scode >= DIOII_SCBASE) 355 if (d->scode >= DIOII_SCBASE)
@@ -373,7 +372,7 @@ static struct dio_driver hpfb_driver = {
373 .name = "hpfb", 372 .name = "hpfb",
374 .id_table = hpfb_dio_tbl, 373 .id_table = hpfb_dio_tbl,
375 .probe = hpfb_dio_probe, 374 .probe = hpfb_dio_probe,
376 .remove = __devexit_p(hpfb_remove_one), 375 .remove = hpfb_remove_one,
377}; 376};
378 377
379int __init hpfb_init(void) 378int __init hpfb_init(void)
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
index ff3f8808e4e9..cfd0c52e8f73 100644
--- a/drivers/video/i740fb.c
+++ b/drivers/video/i740fb.c
@@ -33,10 +33,10 @@
33 33
34#include "i740_reg.h" 34#include "i740_reg.h"
35 35
36static char *mode_option __devinitdata; 36static char *mode_option;
37 37
38#ifdef CONFIG_MTRR 38#ifdef CONFIG_MTRR
39static int mtrr __devinitdata = 1; 39static int mtrr = 1;
40#endif 40#endif
41 41
42struct i740fb_par { 42struct i740fb_par {
@@ -91,7 +91,7 @@ struct i740fb_par {
91#define DACSPEED24_SD 128 91#define DACSPEED24_SD 128
92#define DACSPEED32 86 92#define DACSPEED32 86
93 93
94static struct fb_fix_screeninfo i740fb_fix __devinitdata = { 94static struct fb_fix_screeninfo i740fb_fix = {
95 .id = "i740fb", 95 .id = "i740fb",
96 .type = FB_TYPE_PACKED_PIXELS, 96 .type = FB_TYPE_PACKED_PIXELS,
97 .visual = FB_VISUAL_TRUECOLOR, 97 .visual = FB_VISUAL_TRUECOLOR,
@@ -163,7 +163,7 @@ static int i740fb_ddc_getsda(void *data)
163 return !!(i740inreg(par, XRX, REG_DDC_STATE) & DDC_SDA); 163 return !!(i740inreg(par, XRX, REG_DDC_STATE) & DDC_SDA);
164} 164}
165 165
166static int __devinit i740fb_setup_ddc_bus(struct fb_info *info) 166static int i740fb_setup_ddc_bus(struct fb_info *info)
167{ 167{
168 struct i740fb_par *par = info->par; 168 struct i740fb_par *par = info->par;
169 169
@@ -1007,8 +1007,7 @@ static struct fb_ops i740fb_ops = {
1007 1007
1008/* ------------------------------------------------------------------------- */ 1008/* ------------------------------------------------------------------------- */
1009 1009
1010static int __devinit i740fb_probe(struct pci_dev *dev, 1010static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
1011 const struct pci_device_id *ent)
1012{ 1011{
1013 struct fb_info *info; 1012 struct fb_info *info;
1014 struct i740fb_par *par; 1013 struct i740fb_par *par;
@@ -1174,7 +1173,7 @@ err_enable_device:
1174 return ret; 1173 return ret;
1175} 1174}
1176 1175
1177static void __devexit i740fb_remove(struct pci_dev *dev) 1176static void i740fb_remove(struct pci_dev *dev)
1178{ 1177{
1179 struct fb_info *info = pci_get_drvdata(dev); 1178 struct fb_info *info = pci_get_drvdata(dev);
1180 1179
@@ -1275,7 +1274,7 @@ static struct pci_driver i740fb_driver = {
1275 .name = "i740fb", 1274 .name = "i740fb",
1276 .id_table = i740fb_id_table, 1275 .id_table = i740fb_id_table,
1277 .probe = i740fb_probe, 1276 .probe = i740fb_probe,
1278 .remove = __devexit_p(i740fb_remove), 1277 .remove = i740fb_remove,
1279 .suspend = i740fb_suspend, 1278 .suspend = i740fb_suspend,
1280 .resume = i740fb_resume, 1279 .resume = i740fb_resume,
1281}; 1280};
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 5c067816a81d..4ce3438ade6f 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -74,12 +74,12 @@
74 * 74 *
75 * Experiment with v_offset to find out which works best for you. 75 * Experiment with v_offset to find out which works best for you.
76 */ 76 */
77static u32 v_offset_default __devinitdata; /* For 32 MiB Aper size, 8 should be the default */ 77static u32 v_offset_default; /* For 32 MiB Aper size, 8 should be the default */
78static u32 voffset __devinitdata; 78static u32 voffset;
79 79
80static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor); 80static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor);
81static int __devinit i810fb_init_pci (struct pci_dev *dev, 81static int i810fb_init_pci(struct pci_dev *dev,
82 const struct pci_device_id *entry); 82 const struct pci_device_id *entry);
83static void __exit i810fb_remove_pci(struct pci_dev *dev); 83static void __exit i810fb_remove_pci(struct pci_dev *dev);
84static int i810fb_resume(struct pci_dev *dev); 84static int i810fb_resume(struct pci_dev *dev);
85static int i810fb_suspend(struct pci_dev *dev, pm_message_t state); 85static int i810fb_suspend(struct pci_dev *dev, pm_message_t state);
@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
97static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par); 97static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
98 98
99/* PCI */ 99/* PCI */
100static const char * const i810_pci_list[] __devinitconst = { 100static const char * const i810_pci_list[] = {
101 "Intel(R) 810 Framebuffer Device" , 101 "Intel(R) 810 Framebuffer Device" ,
102 "Intel(R) 810-DC100 Framebuffer Device" , 102 "Intel(R) 810-DC100 Framebuffer Device" ,
103 "Intel(R) 810E Framebuffer Device" , 103 "Intel(R) 810E Framebuffer Device" ,
@@ -132,22 +132,22 @@ static struct pci_driver i810fb_driver = {
132 .resume = i810fb_resume, 132 .resume = i810fb_resume,
133}; 133};
134 134
135static char *mode_option __devinitdata = NULL; 135static char *mode_option = NULL;
136static int vram __devinitdata = 4; 136static int vram = 4;
137static int bpp __devinitdata = 8; 137static int bpp = 8;
138static bool mtrr __devinitdata; 138static bool mtrr;
139static bool accel __devinitdata; 139static bool accel;
140static int hsync1 __devinitdata; 140static int hsync1;
141static int hsync2 __devinitdata; 141static int hsync2;
142static int vsync1 __devinitdata; 142static int vsync1;
143static int vsync2 __devinitdata; 143static int vsync2;
144static int xres __devinitdata; 144static int xres;
145static int yres; 145static int yres;
146static int vyres __devinitdata; 146static int vyres;
147static bool sync __devinitdata; 147static bool sync;
148static bool extvga __devinitdata; 148static bool extvga;
149static bool dcolor __devinitdata; 149static bool dcolor;
150static bool ddc3 __devinitdata; 150static bool ddc3;
151 151
152/*------------------------------------------------------------*/ 152/*------------------------------------------------------------*/
153 153
@@ -1541,7 +1541,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
1541 return 0; 1541 return 0;
1542} 1542}
1543 1543
1544static struct fb_ops i810fb_ops __devinitdata = { 1544static struct fb_ops i810fb_ops = {
1545 .owner = THIS_MODULE, 1545 .owner = THIS_MODULE,
1546 .fb_open = i810fb_open, 1546 .fb_open = i810fb_open,
1547 .fb_release = i810fb_release, 1547 .fb_release = i810fb_release,
@@ -1628,7 +1628,7 @@ fail:
1628 * AGP resource allocation * 1628 * AGP resource allocation *
1629 ***********************************************************************/ 1629 ***********************************************************************/
1630 1630
1631static void __devinit i810_fix_pointers(struct i810fb_par *par) 1631static void i810_fix_pointers(struct i810fb_par *par)
1632{ 1632{
1633 par->fb.physical = par->aperture.physical+(par->fb.offset << 12); 1633 par->fb.physical = par->aperture.physical+(par->fb.offset << 12);
1634 par->fb.virtual = par->aperture.virtual+(par->fb.offset << 12); 1634 par->fb.virtual = par->aperture.virtual+(par->fb.offset << 12);
@@ -1640,7 +1640,7 @@ static void __devinit i810_fix_pointers(struct i810fb_par *par)
1640 (par->cursor_heap.offset << 12); 1640 (par->cursor_heap.offset << 12);
1641} 1641}
1642 1642
1643static void __devinit i810_fix_offsets(struct i810fb_par *par) 1643static void i810_fix_offsets(struct i810fb_par *par)
1644{ 1644{
1645 if (vram + 1 > par->aperture.size >> 20) 1645 if (vram + 1 > par->aperture.size >> 20)
1646 vram = (par->aperture.size >> 20) - 1; 1646 vram = (par->aperture.size >> 20) - 1;
@@ -1660,7 +1660,7 @@ static void __devinit i810_fix_offsets(struct i810fb_par *par)
1660 par->cursor_heap.size = 4096; 1660 par->cursor_heap.size = 4096;
1661} 1661}
1662 1662
1663static int __devinit i810_alloc_agp_mem(struct fb_info *info) 1663static int i810_alloc_agp_mem(struct fb_info *info)
1664{ 1664{
1665 struct i810fb_par *par = info->par; 1665 struct i810fb_par *par = info->par;
1666 int size; 1666 int size;
@@ -1723,7 +1723,7 @@ static int __devinit i810_alloc_agp_mem(struct fb_info *info)
1723 * Sets the user monitor's horizontal and vertical 1723 * Sets the user monitor's horizontal and vertical
1724 * frequency limits 1724 * frequency limits
1725 */ 1725 */
1726static void __devinit i810_init_monspecs(struct fb_info *info) 1726static void i810_init_monspecs(struct fb_info *info)
1727{ 1727{
1728 if (!hsync1) 1728 if (!hsync1)
1729 hsync1 = HFMIN; 1729 hsync1 = HFMIN;
@@ -1755,8 +1755,7 @@ static void __devinit i810_init_monspecs(struct fb_info *info)
1755 * @par: pointer to i810fb_par structure 1755 * @par: pointer to i810fb_par structure
1756 * @info: pointer to current fb_info structure 1756 * @info: pointer to current fb_info structure
1757 */ 1757 */
1758static void __devinit i810_init_defaults(struct i810fb_par *par, 1758static void i810_init_defaults(struct i810fb_par *par, struct fb_info *info)
1759 struct fb_info *info)
1760{ 1759{
1761 mutex_init(&par->open_lock); 1760 mutex_init(&par->open_lock);
1762 1761
@@ -1812,7 +1811,7 @@ static void __devinit i810_init_defaults(struct i810fb_par *par,
1812 * i810_init_device - initialize device 1811 * i810_init_device - initialize device
1813 * @par: pointer to i810fb_par structure 1812 * @par: pointer to i810fb_par structure
1814 */ 1813 */
1815static void __devinit i810_init_device(struct i810fb_par *par) 1814static void i810_init_device(struct i810fb_par *par)
1816{ 1815{
1817 u8 reg; 1816 u8 reg;
1818 u8 __iomem *mmio = par->mmio_start_virtual; 1817 u8 __iomem *mmio = par->mmio_start_virtual;
@@ -1833,9 +1832,8 @@ static void __devinit i810_init_device(struct i810fb_par *par)
1833 1832
1834} 1833}
1835 1834
1836static int __devinit 1835static int i810_allocate_pci_resource(struct i810fb_par *par,
1837i810_allocate_pci_resource(struct i810fb_par *par, 1836 const struct pci_device_id *entry)
1838 const struct pci_device_id *entry)
1839{ 1837{
1840 int err; 1838 int err;
1841 1839
@@ -1892,7 +1890,7 @@ i810_allocate_pci_resource(struct i810fb_par *par,
1892 return 0; 1890 return 0;
1893} 1891}
1894 1892
1895static void __devinit i810fb_find_init_mode(struct fb_info *info) 1893static void i810fb_find_init_mode(struct fb_info *info)
1896{ 1894{
1897 struct fb_videomode mode; 1895 struct fb_videomode mode;
1898 struct fb_var_screeninfo var; 1896 struct fb_var_screeninfo var;
@@ -1956,7 +1954,7 @@ static void __devinit i810fb_find_init_mode(struct fb_info *info)
1956} 1954}
1957 1955
1958#ifndef MODULE 1956#ifndef MODULE
1959static int __devinit i810fb_setup(char *options) 1957static int i810fb_setup(char *options)
1960{ 1958{
1961 char *this_opt, *suffix = NULL; 1959 char *this_opt, *suffix = NULL;
1962 1960
@@ -2007,8 +2005,8 @@ static int __devinit i810fb_setup(char *options)
2007} 2005}
2008#endif 2006#endif
2009 2007
2010static int __devinit i810fb_init_pci (struct pci_dev *dev, 2008static int i810fb_init_pci(struct pci_dev *dev,
2011 const struct pci_device_id *entry) 2009 const struct pci_device_id *entry)
2012{ 2010{
2013 struct fb_info *info; 2011 struct fb_info *info;
2014 struct i810fb_par *par = NULL; 2012 struct i810fb_par *par = NULL;
@@ -2136,7 +2134,7 @@ static void __exit i810fb_remove_pci(struct pci_dev *dev)
2136} 2134}
2137 2135
2138#ifndef MODULE 2136#ifndef MODULE
2139static int __devinit i810fb_init(void) 2137static int i810fb_init(void)
2140{ 2138{
2141 char *option = NULL; 2139 char *option = NULL;
2142 2140
@@ -2154,7 +2152,7 @@ static int __devinit i810fb_init(void)
2154 2152
2155#ifdef MODULE 2153#ifdef MODULE
2156 2154
2157static int __devinit i810fb_init(void) 2155static int i810fb_init(void)
2158{ 2156{
2159 hsync1 *= 1000; 2157 hsync1 *= 1000;
2160 hsync2 *= 1000; 2158 hsync2 *= 1000;
diff --git a/drivers/video/i810/i810_main.h b/drivers/video/i810/i810_main.h
index 51d4f3d4116d..a25afaa534ba 100644
--- a/drivers/video/i810/i810_main.h
+++ b/drivers/video/i810/i810_main.h
@@ -64,7 +64,7 @@ static inline void flush_cache(void)
64 64
65#include <asm/mtrr.h> 65#include <asm/mtrr.h>
66 66
67static inline void __devinit set_mtrr(struct i810fb_par *par) 67static inline void set_mtrr(struct i810fb_par *par)
68{ 68{
69 par->mtrr_reg = mtrr_add((u32) par->aperture.physical, 69 par->mtrr_reg = mtrr_add((u32) par->aperture.physical,
70 par->aperture.size, MTRR_TYPE_WRCOMB, 1); 70 par->aperture.size, MTRR_TYPE_WRCOMB, 1);
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 2d97752f79a5..79cbfa7d1a9b 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -571,7 +571,7 @@ static int __init igafb_setup(char *options)
571 571
572module_init(igafb_init); 572module_init(igafb_init);
573MODULE_LICENSE("GPL"); 573MODULE_LICENSE("GPL");
574static struct pci_device_id igafb_pci_tbl[] __devinitdata = { 574static struct pci_device_id igafb_pci_tbl[] = {
575 { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682, 575 { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
576 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 576 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
577 { } 577 { }
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 8149356471e4..d5220cc90e93 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -225,7 +225,7 @@ struct initvalues {
225 __u8 addr, value; 225 __u8 addr, value;
226}; 226};
227 227
228static struct initvalues ibm_initregs[] __devinitdata = { 228static struct initvalues ibm_initregs[] = {
229 { CLKCTL, 0x21 }, 229 { CLKCTL, 0x21 },
230 { SYNCCTL, 0x00 }, 230 { SYNCCTL, 0x00 },
231 { HSYNCPOS, 0x00 }, 231 { HSYNCPOS, 0x00 },
@@ -272,7 +272,7 @@ static struct initvalues ibm_initregs[] __devinitdata = {
272 { KEYCTL, 0x00 } 272 { KEYCTL, 0x00 }
273}; 273};
274 274
275static struct initvalues tvp_initregs[] __devinitdata = { 275static struct initvalues tvp_initregs[] = {
276 { TVPIRICC, 0x00 }, 276 { TVPIRICC, 0x00 },
277 { TVPIRBRC, 0xe4 }, 277 { TVPIRBRC, 0xe4 },
278 { TVPIRLAC, 0x06 }, 278 { TVPIRLAC, 0x06 },
@@ -336,7 +336,7 @@ enum {
336static int inverse = 0; 336static int inverse = 0;
337static char fontname[40] __initdata = { 0 }; 337static char fontname[40] __initdata = { 0 };
338#if defined(CONFIG_PPC) 338#if defined(CONFIG_PPC)
339static signed char init_vmode __devinitdata = -1, init_cmode __devinitdata = -1; 339static signed char init_vmode = -1, init_cmode = -1;
340#endif 340#endif
341 341
342static struct imstt_regvals tvp_reg_init_2 = { 342static struct imstt_regvals tvp_reg_init_2 = {
@@ -1333,7 +1333,7 @@ static struct pci_driver imsttfb_pci_driver = {
1333 .name = "imsttfb", 1333 .name = "imsttfb",
1334 .id_table = imsttfb_pci_tbl, 1334 .id_table = imsttfb_pci_tbl,
1335 .probe = imsttfb_probe, 1335 .probe = imsttfb_probe,
1336 .remove = __devexit_p(imsttfb_remove), 1336 .remove = imsttfb_remove,
1337}; 1337};
1338 1338
1339static struct fb_ops imsttfb_ops = { 1339static struct fb_ops imsttfb_ops = {
@@ -1349,8 +1349,7 @@ static struct fb_ops imsttfb_ops = {
1349 .fb_ioctl = imsttfb_ioctl, 1349 .fb_ioctl = imsttfb_ioctl,
1350}; 1350};
1351 1351
1352static void __devinit 1352static void init_imstt(struct fb_info *info)
1353init_imstt(struct fb_info *info)
1354{ 1353{
1355 struct imstt_par *par = info->par; 1354 struct imstt_par *par = info->par;
1356 __u32 i, tmp, *ip, *end; 1355 __u32 i, tmp, *ip, *end;
@@ -1466,8 +1465,7 @@ init_imstt(struct fb_info *info)
1466 info->node, info->fix.id, info->fix.smem_len >> 20, tmp); 1465 info->node, info->fix.id, info->fix.smem_len >> 20, tmp);
1467} 1466}
1468 1467
1469static int __devinit 1468static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1470imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1471{ 1469{
1472 unsigned long addr, size; 1470 unsigned long addr, size;
1473 struct imstt_par *par; 1471 struct imstt_par *par;
@@ -1534,8 +1532,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1534 return 0; 1532 return 0;
1535} 1533}
1536 1534
1537static void __devexit 1535static void imsttfb_remove(struct pci_dev *pdev)
1538imsttfb_remove(struct pci_dev *pdev)
1539{ 1536{
1540 struct fb_info *info = pci_get_drvdata(pdev); 1537 struct fb_info *info = pci_get_drvdata(pdev);
1541 struct imstt_par *par = info->par; 1538 struct imstt_par *par = info->par;
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index e501dbc966b3..12526787a7c7 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -917,7 +917,7 @@ failed_init:
917 return ret; 917 return ret;
918} 918}
919 919
920static int __devexit imxfb_remove(struct platform_device *pdev) 920static int imxfb_remove(struct platform_device *pdev)
921{ 921{
922 struct imx_fb_platform_data *pdata; 922 struct imx_fb_platform_data *pdata;
923 struct fb_info *info = platform_get_drvdata(pdev); 923 struct fb_info *info = platform_get_drvdata(pdev);
@@ -959,7 +959,7 @@ void imxfb_shutdown(struct platform_device * dev)
959static struct platform_driver imxfb_driver = { 959static struct platform_driver imxfb_driver = {
960 .suspend = imxfb_suspend, 960 .suspend = imxfb_suspend,
961 .resume = imxfb_resume, 961 .resume = imxfb_resume,
962 .remove = __devexit_p(imxfb_remove), 962 .remove = imxfb_remove,
963 .shutdown = imxfb_shutdown, 963 .shutdown = imxfb_shutdown,
964 .driver = { 964 .driver = {
965 .name = DRIVER_NAME, 965 .name = DRIVER_NAME,
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index bdcbfbae2777..8209e46c5d28 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -132,7 +132,7 @@
132#include "intelfbhw.h" 132#include "intelfbhw.h"
133#include "../edid.h" 133#include "../edid.h"
134 134
135static void __devinit get_initial_mode(struct intelfb_info *dinfo); 135static void get_initial_mode(struct intelfb_info *dinfo);
136static void update_dinfo(struct intelfb_info *dinfo, 136static void update_dinfo(struct intelfb_info *dinfo,
137 struct fb_var_screeninfo *var); 137 struct fb_var_screeninfo *var);
138static int intelfb_open(struct fb_info *info, int user); 138static int intelfb_open(struct fb_info *info, int user);
@@ -162,10 +162,10 @@ static int intelfb_sync(struct fb_info *info);
162static int intelfb_ioctl(struct fb_info *info, 162static int intelfb_ioctl(struct fb_info *info,
163 unsigned int cmd, unsigned long arg); 163 unsigned int cmd, unsigned long arg);
164 164
165static int __devinit intelfb_pci_register(struct pci_dev *pdev, 165static int intelfb_pci_register(struct pci_dev *pdev,
166 const struct pci_device_id *ent); 166 const struct pci_device_id *ent);
167static void __devexit intelfb_pci_unregister(struct pci_dev *pdev); 167static void intelfb_pci_unregister(struct pci_dev *pdev);
168static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo); 168static int intelfb_set_fbinfo(struct intelfb_info *dinfo);
169 169
170/* 170/*
171 * Limiting the class to PCI_CLASS_DISPLAY_VGA prevents function 1 of the 171 * Limiting the class to PCI_CLASS_DISPLAY_VGA prevents function 1 of the
@@ -177,7 +177,7 @@ static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo);
177#define INTELFB_CLASS_MASK 0 177#define INTELFB_CLASS_MASK 0
178#endif 178#endif
179 179
180static struct pci_device_id intelfb_pci_table[] __devinitdata = { 180static struct pci_device_id intelfb_pci_table[] = {
181 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_830M, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_830M }, 181 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_830M, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_830M },
182 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_845G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_845G }, 182 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_845G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_845G },
183 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM }, 183 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM },
@@ -219,7 +219,7 @@ static struct pci_driver intelfb_driver = {
219 .name = "intelfb", 219 .name = "intelfb",
220 .id_table = intelfb_pci_table, 220 .id_table = intelfb_pci_table,
221 .probe = intelfb_pci_register, 221 .probe = intelfb_pci_register,
222 .remove = __devexit_p(intelfb_pci_unregister) 222 .remove = intelfb_pci_unregister,
223}; 223};
224 224
225/* Module description/parameters */ 225/* Module description/parameters */
@@ -415,7 +415,7 @@ module_exit(intelfb_exit);
415 ***************************************************************/ 415 ***************************************************************/
416 416
417#ifdef CONFIG_MTRR 417#ifdef CONFIG_MTRR
418static inline void __devinit set_mtrr(struct intelfb_info *dinfo) 418static inline void set_mtrr(struct intelfb_info *dinfo)
419{ 419{
420 dinfo->mtrr_reg = mtrr_add(dinfo->aperture.physical, 420 dinfo->mtrr_reg = mtrr_add(dinfo->aperture.physical,
421 dinfo->aperture.size, MTRR_TYPE_WRCOMB, 1); 421 dinfo->aperture.size, MTRR_TYPE_WRCOMB, 1);
@@ -497,8 +497,8 @@ static void cleanup(struct intelfb_info *dinfo)
497} while (0) 497} while (0)
498 498
499 499
500static int __devinit intelfb_pci_register(struct pci_dev *pdev, 500static int intelfb_pci_register(struct pci_dev *pdev,
501 const struct pci_device_id *ent) 501 const struct pci_device_id *ent)
502{ 502{
503 struct fb_info *info; 503 struct fb_info *info;
504 struct intelfb_info *dinfo; 504 struct intelfb_info *dinfo;
@@ -921,8 +921,7 @@ err_out_cmap:
921 return -ENODEV; 921 return -ENODEV;
922} 922}
923 923
924static void __devexit 924static void intelfb_pci_unregister(struct pci_dev *pdev)
925intelfb_pci_unregister(struct pci_dev *pdev)
926{ 925{
927 struct intelfb_info *dinfo = pci_get_drvdata(pdev); 926 struct intelfb_info *dinfo = pci_get_drvdata(pdev);
928 927
@@ -970,7 +969,7 @@ static __inline__ int var_to_refresh(const struct fb_var_screeninfo *var)
970 * Various intialisation functions * 969 * Various intialisation functions *
971 ***************************************************************/ 970 ***************************************************************/
972 971
973static void __devinit get_initial_mode(struct intelfb_info *dinfo) 972static void get_initial_mode(struct intelfb_info *dinfo)
974{ 973{
975 struct fb_var_screeninfo *var; 974 struct fb_var_screeninfo *var;
976 int xtot, ytot; 975 int xtot, ytot;
@@ -1037,7 +1036,7 @@ static void __devinit get_initial_mode(struct intelfb_info *dinfo)
1037 } 1036 }
1038} 1037}
1039 1038
1040static int __devinit intelfb_init_var(struct intelfb_info *dinfo) 1039static int intelfb_init_var(struct intelfb_info *dinfo)
1041{ 1040{
1042 struct fb_var_screeninfo *var; 1041 struct fb_var_screeninfo *var;
1043 int msrc = 0; 1042 int msrc = 0;
@@ -1118,7 +1117,7 @@ static int __devinit intelfb_init_var(struct intelfb_info *dinfo)
1118 return 0; 1117 return 0;
1119} 1118}
1120 1119
1121static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo) 1120static int intelfb_set_fbinfo(struct intelfb_info *dinfo)
1122{ 1121{
1123 struct fb_info *info = dinfo->info; 1122 struct fb_info *info = dinfo->info;
1124 1123
diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index 4d25711b9982..d999bb5e0485 100644
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c
@@ -136,7 +136,7 @@ struct jzfb {
136 uint32_t pseudo_palette[16]; 136 uint32_t pseudo_palette[16];
137}; 137};
138 138
139static const struct fb_fix_screeninfo jzfb_fix __devinitconst = { 139static const struct fb_fix_screeninfo jzfb_fix = {
140 .id = "JZ4740 FB", 140 .id = "JZ4740 FB",
141 .type = FB_TYPE_PACKED_PIXELS, 141 .type = FB_TYPE_PACKED_PIXELS,
142 .visual = FB_VISUAL_TRUECOLOR, 142 .visual = FB_VISUAL_TRUECOLOR,
@@ -619,7 +619,7 @@ static struct fb_ops jzfb_ops = {
619 .fb_setcolreg = jzfb_setcolreg, 619 .fb_setcolreg = jzfb_setcolreg,
620}; 620};
621 621
622static int __devinit jzfb_probe(struct platform_device *pdev) 622static int jzfb_probe(struct platform_device *pdev)
623{ 623{
624 int ret; 624 int ret;
625 struct jzfb *jzfb; 625 struct jzfb *jzfb;
@@ -725,7 +725,7 @@ err_framebuffer_release:
725 return ret; 725 return ret;
726} 726}
727 727
728static int __devexit jzfb_remove(struct platform_device *pdev) 728static int jzfb_remove(struct platform_device *pdev)
729{ 729{
730 struct jzfb *jzfb = platform_get_drvdata(pdev); 730 struct jzfb *jzfb = platform_get_drvdata(pdev);
731 731
@@ -794,7 +794,7 @@ static const struct dev_pm_ops jzfb_pm_ops = {
794 794
795static struct platform_driver jzfb_driver = { 795static struct platform_driver jzfb_driver = {
796 .probe = jzfb_probe, 796 .probe = jzfb_probe,
797 .remove = __devexit_p(jzfb_remove), 797 .remove = jzfb_remove,
798 .driver = { 798 .driver = {
799 .name = "jz4740-fb", 799 .name = "jz4740-fb",
800 .pm = JZFB_PM_OPS, 800 .pm = JZFB_PM_OPS,
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index acb9370fdb14..6157f74ac600 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -40,14 +40,14 @@
40#define KHZ2PICOS(a) (1000000000UL/(a)) 40#define KHZ2PICOS(a) (1000000000UL/(a))
41 41
42/****************************************************************************/ 42/****************************************************************************/
43static struct fb_fix_screeninfo kyro_fix __devinitdata = { 43static struct fb_fix_screeninfo kyro_fix = {
44 .id = "ST Kyro", 44 .id = "ST Kyro",
45 .type = FB_TYPE_PACKED_PIXELS, 45 .type = FB_TYPE_PACKED_PIXELS,
46 .visual = FB_VISUAL_TRUECOLOR, 46 .visual = FB_VISUAL_TRUECOLOR,
47 .accel = FB_ACCEL_NONE, 47 .accel = FB_ACCEL_NONE,
48}; 48};
49 49
50static struct fb_var_screeninfo kyro_var __devinitdata = { 50static struct fb_var_screeninfo kyro_var = {
51 /* 640x480, 16bpp @ 60 Hz */ 51 /* 640x480, 16bpp @ 60 Hz */
52 .xres = 640, 52 .xres = 640,
53 .yres = 480, 53 .yres = 480,
@@ -81,18 +81,18 @@ typedef struct {
81/* global graphics card info structure (one per card) */ 81/* global graphics card info structure (one per card) */
82static device_info_t deviceInfo; 82static device_info_t deviceInfo;
83 83
84static char *mode_option __devinitdata = NULL; 84static char *mode_option = NULL;
85static int nopan __devinitdata = 0; 85static int nopan = 0;
86static int nowrap __devinitdata = 1; 86static int nowrap = 1;
87#ifdef CONFIG_MTRR 87#ifdef CONFIG_MTRR
88static int nomtrr __devinitdata = 0; 88static int nomtrr = 0;
89#endif 89#endif
90 90
91/* PCI driver prototypes */ 91/* PCI driver prototypes */
92static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 92static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
93static void kyrofb_remove(struct pci_dev *pdev); 93static void kyrofb_remove(struct pci_dev *pdev);
94 94
95static struct fb_videomode kyro_modedb[] __devinitdata = { 95static struct fb_videomode kyro_modedb[] = {
96 { 96 {
97 /* 640x350 @ 85Hz */ 97 /* 640x350 @ 85Hz */
98 NULL, 85, 640, 350, KHZ2PICOS(31500), 98 NULL, 85, 640, 350, KHZ2PICOS(31500),
@@ -653,7 +653,7 @@ static struct pci_driver kyrofb_pci_driver = {
653 .name = "kyrofb", 653 .name = "kyrofb",
654 .id_table = kyrofb_pci_tbl, 654 .id_table = kyrofb_pci_tbl,
655 .probe = kyrofb_probe, 655 .probe = kyrofb_probe,
656 .remove = __devexit_p(kyrofb_remove), 656 .remove = kyrofb_remove,
657}; 657};
658 658
659static struct fb_ops kyrofb_ops = { 659static struct fb_ops kyrofb_ops = {
@@ -667,8 +667,7 @@ static struct fb_ops kyrofb_ops = {
667 .fb_imageblit = cfb_imageblit, 667 .fb_imageblit = cfb_imageblit,
668}; 668};
669 669
670static int __devinit kyrofb_probe(struct pci_dev *pdev, 670static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
671 const struct pci_device_id *ent)
672{ 671{
673 struct fb_info *info; 672 struct fb_info *info;
674 struct kyrofb_info *currentpar; 673 struct kyrofb_info *currentpar;
@@ -754,7 +753,7 @@ out_unmap:
754 return -EINVAL; 753 return -EINVAL;
755} 754}
756 755
757static void __devexit kyrofb_remove(struct pci_dev *pdev) 756static void kyrofb_remove(struct pci_dev *pdev)
758{ 757{
759 struct fb_info *info = pci_get_drvdata(pdev); 758 struct fb_info *info = pci_get_drvdata(pdev);
760 struct kyrofb_info *par = info->par; 759 struct kyrofb_info *par = info->par;
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 9e946e2c1da9..b17f5009a436 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -547,7 +547,7 @@ static void leo_unmap_regs(struct platform_device *op, struct fb_info *info,
547 of_iounmap(&op->resource[0], info->screen_base, 0x800000); 547 of_iounmap(&op->resource[0], info->screen_base, 0x800000);
548} 548}
549 549
550static int __devinit leo_probe(struct platform_device *op) 550static int leo_probe(struct platform_device *op)
551{ 551{
552 struct device_node *dp = op->dev.of_node; 552 struct device_node *dp = op->dev.of_node;
553 struct fb_info *info; 553 struct fb_info *info;
@@ -636,7 +636,7 @@ out_err:
636 return err; 636 return err;
637} 637}
638 638
639static int __devexit leo_remove(struct platform_device *op) 639static int leo_remove(struct platform_device *op)
640{ 640{
641 struct fb_info *info = dev_get_drvdata(&op->dev); 641 struct fb_info *info = dev_get_drvdata(&op->dev);
642 struct leo_par *par = info->par; 642 struct leo_par *par = info->par;
@@ -668,7 +668,7 @@ static struct platform_driver leo_driver = {
668 .of_match_table = leo_match, 668 .of_match_table = leo_match,
669 }, 669 },
670 .probe = leo_probe, 670 .probe = leo_probe,
671 .remove = __devexit_p(leo_remove), 671 .remove = leo_remove,
672}; 672};
673 673
674static int __init leo_init(void) 674static int __init leo_init(void)
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index d68e332aa21c..91c59c9fb082 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -668,7 +668,7 @@ static int mb862xx_gdc_init(struct mb862xxfb_par *par)
668 return 0; 668 return 0;
669} 669}
670 670
671static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev) 671static int of_platform_mb862xx_probe(struct platform_device *ofdev)
672{ 672{
673 struct device_node *np = ofdev->dev.of_node; 673 struct device_node *np = ofdev->dev.of_node;
674 struct device *dev = &ofdev->dev; 674 struct device *dev = &ofdev->dev;
@@ -786,7 +786,7 @@ fbrel:
786 return ret; 786 return ret;
787} 787}
788 788
789static int __devexit of_platform_mb862xx_remove(struct platform_device *ofdev) 789static int of_platform_mb862xx_remove(struct platform_device *ofdev)
790{ 790{
791 struct fb_info *fbi = dev_get_drvdata(&ofdev->dev); 791 struct fb_info *fbi = dev_get_drvdata(&ofdev->dev);
792 struct mb862xxfb_par *par = fbi->par; 792 struct mb862xxfb_par *par = fbi->par;
@@ -823,7 +823,7 @@ static int __devexit of_platform_mb862xx_remove(struct platform_device *ofdev)
823/* 823/*
824 * common types 824 * common types
825 */ 825 */
826static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = { 826static struct of_device_id of_platform_mb862xx_tbl[] = {
827 { .compatible = "fujitsu,MB86276", }, 827 { .compatible = "fujitsu,MB86276", },
828 { .compatible = "fujitsu,lime", }, 828 { .compatible = "fujitsu,lime", },
829 { .compatible = "fujitsu,MB86277", }, 829 { .compatible = "fujitsu,MB86277", },
@@ -841,7 +841,7 @@ static struct platform_driver of_platform_mb862xxfb_driver = {
841 .of_match_table = of_platform_mb862xx_tbl, 841 .of_match_table = of_platform_mb862xx_tbl,
842 }, 842 },
843 .probe = of_platform_mb862xx_probe, 843 .probe = of_platform_mb862xx_probe,
844 .remove = __devexit_p(of_platform_mb862xx_remove), 844 .remove = of_platform_mb862xx_remove,
845}; 845};
846#endif 846#endif
847 847
@@ -984,7 +984,7 @@ static inline int mb862xx_pci_gdc_init(struct mb862xxfb_par *par)
984#define CHIP_ID(id) \ 984#define CHIP_ID(id) \
985 { PCI_DEVICE(PCI_VENDOR_ID_FUJITSU_LIMITED, id) } 985 { PCI_DEVICE(PCI_VENDOR_ID_FUJITSU_LIMITED, id) }
986 986
987static struct pci_device_id mb862xx_pci_tbl[] __devinitdata = { 987static struct pci_device_id mb862xx_pci_tbl[] = {
988 /* MB86295/MB86296 */ 988 /* MB86295/MB86296 */
989 CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALP), 989 CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALP),
990 CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALPA), 990 CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALPA),
@@ -995,8 +995,8 @@ static struct pci_device_id mb862xx_pci_tbl[] __devinitdata = {
995 995
996MODULE_DEVICE_TABLE(pci, mb862xx_pci_tbl); 996MODULE_DEVICE_TABLE(pci, mb862xx_pci_tbl);
997 997
998static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, 998static int mb862xx_pci_probe(struct pci_dev *pdev,
999 const struct pci_device_id *ent) 999 const struct pci_device_id *ent)
1000{ 1000{
1001 struct mb862xxfb_par *par; 1001 struct mb862xxfb_par *par;
1002 struct fb_info *info; 1002 struct fb_info *info;
@@ -1133,7 +1133,7 @@ out:
1133 return ret; 1133 return ret;
1134} 1134}
1135 1135
1136static void __devexit mb862xx_pci_remove(struct pci_dev *pdev) 1136static void mb862xx_pci_remove(struct pci_dev *pdev)
1137{ 1137{
1138 struct fb_info *fbi = pci_get_drvdata(pdev); 1138 struct fb_info *fbi = pci_get_drvdata(pdev);
1139 struct mb862xxfb_par *par = fbi->par; 1139 struct mb862xxfb_par *par = fbi->par;
@@ -1174,11 +1174,11 @@ static struct pci_driver mb862xxfb_pci_driver = {
1174 .name = DRV_NAME, 1174 .name = DRV_NAME,
1175 .id_table = mb862xx_pci_tbl, 1175 .id_table = mb862xx_pci_tbl,
1176 .probe = mb862xx_pci_probe, 1176 .probe = mb862xx_pci_probe,
1177 .remove = __devexit_p(mb862xx_pci_remove), 1177 .remove = mb862xx_pci_remove,
1178}; 1178};
1179#endif 1179#endif
1180 1180
1181static int __devinit mb862xxfb_init(void) 1181static int mb862xxfb_init(void)
1182{ 1182{
1183 int ret = -ENODEV; 1183 int ret = -ENODEV;
1184 1184
diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c
index 12dec7634c55..4449f249b0e7 100644
--- a/drivers/video/mbx/mbxdebugfs.c
+++ b/drivers/video/mbx/mbxdebugfs.c
@@ -213,7 +213,7 @@ static const struct file_operations misc_fops = {
213 .llseek = default_llseek, 213 .llseek = default_llseek,
214}; 214};
215 215
216static void __devinit mbxfb_debugfs_init(struct fb_info *fbi) 216static void mbxfb_debugfs_init(struct fb_info *fbi)
217{ 217{
218 struct mbxfb_info *mfbi = fbi->par; 218 struct mbxfb_info *mfbi = fbi->par;
219 struct mbxfb_debugfs_data *dbg; 219 struct mbxfb_debugfs_data *dbg;
@@ -236,7 +236,7 @@ static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)
236 fbi, &misc_fops); 236 fbi, &misc_fops);
237} 237}
238 238
239static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi) 239static void mbxfb_debugfs_remove(struct fb_info *fbi)
240{ 240{
241 struct mbxfb_info *mfbi = fbi->par; 241 struct mbxfb_info *mfbi = fbi->par;
242 struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data; 242 struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data;
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 6563e50413c1..0c1a874ffd2b 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -79,7 +79,7 @@ struct mbxfb_info {
79 79
80}; 80};
81 81
82static struct fb_var_screeninfo mbxfb_default __devinitdata = { 82static struct fb_var_screeninfo mbxfb_default = {
83 .xres = 640, 83 .xres = 640,
84 .yres = 480, 84 .yres = 480,
85 .xres_virtual = 640, 85 .xres_virtual = 640,
@@ -102,7 +102,7 @@ static struct fb_var_screeninfo mbxfb_default __devinitdata = {
102 .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, 102 .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
103}; 103};
104 104
105static struct fb_fix_screeninfo mbxfb_fix __devinitdata = { 105static struct fb_fix_screeninfo mbxfb_fix = {
106 .id = "MBX", 106 .id = "MBX",
107 .type = FB_TYPE_PACKED_PIXELS, 107 .type = FB_TYPE_PACKED_PIXELS,
108 .visual = FB_VISUAL_TRUECOLOR, 108 .visual = FB_VISUAL_TRUECOLOR,
@@ -687,7 +687,7 @@ static struct fb_ops mbxfb_ops = {
687 Enable external SDRAM controller. Assume that all clocks are active 687 Enable external SDRAM controller. Assume that all clocks are active
688 by now. 688 by now.
689*/ 689*/
690static void __devinit setup_memc(struct fb_info *fbi) 690static void setup_memc(struct fb_info *fbi)
691{ 691{
692 unsigned long tmp; 692 unsigned long tmp;
693 int i; 693 int i;
@@ -747,7 +747,7 @@ static void enable_clocks(struct fb_info *fbi)
747 write_reg_dly(0x00000001, PIXCLKDIV); 747 write_reg_dly(0x00000001, PIXCLKDIV);
748} 748}
749 749
750static void __devinit setup_graphics(struct fb_info *fbi) 750static void setup_graphics(struct fb_info *fbi)
751{ 751{
752 unsigned long gsctrl; 752 unsigned long gsctrl;
753 unsigned long vscadr; 753 unsigned long vscadr;
@@ -781,7 +781,7 @@ static void __devinit setup_graphics(struct fb_info *fbi)
781 write_reg_dly(vscadr, VSCADR); 781 write_reg_dly(vscadr, VSCADR);
782} 782}
783 783
784static void __devinit setup_display(struct fb_info *fbi) 784static void setup_display(struct fb_info *fbi)
785{ 785{
786 unsigned long dsctrl = 0; 786 unsigned long dsctrl = 0;
787 787
@@ -795,7 +795,7 @@ static void __devinit setup_display(struct fb_info *fbi)
795 write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL); 795 write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
796} 796}
797 797
798static void __devinit enable_controller(struct fb_info *fbi) 798static void enable_controller(struct fb_info *fbi)
799{ 799{
800 u32 svctrl, shctrl; 800 u32 svctrl, shctrl;
801 801
@@ -881,7 +881,7 @@ static int mbxfb_resume(struct platform_device *dev)
881 881
882#define res_size(_r) (((_r)->end - (_r)->start) + 1) 882#define res_size(_r) (((_r)->end - (_r)->start) + 1)
883 883
884static int __devinit mbxfb_probe(struct platform_device *dev) 884static int mbxfb_probe(struct platform_device *dev)
885{ 885{
886 int ret; 886 int ret;
887 struct fb_info *fbi; 887 struct fb_info *fbi;
@@ -1006,7 +1006,7 @@ err1:
1006 return ret; 1006 return ret;
1007} 1007}
1008 1008
1009static int __devexit mbxfb_remove(struct platform_device *dev) 1009static int mbxfb_remove(struct platform_device *dev)
1010{ 1010{
1011 struct fb_info *fbi = platform_get_drvdata(dev); 1011 struct fb_info *fbi = platform_get_drvdata(dev);
1012 1012
@@ -1038,7 +1038,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
1038 1038
1039static struct platform_driver mbxfb_driver = { 1039static struct platform_driver mbxfb_driver = {
1040 .probe = mbxfb_probe, 1040 .probe = mbxfb_probe,
1041 .remove = __devexit_p(mbxfb_remove), 1041 .remove = mbxfb_remove,
1042 .suspend = mbxfb_suspend, 1042 .suspend = mbxfb_suspend,
1043 .resume = mbxfb_resume, 1043 .resume = mbxfb_resume,
1044 .driver = { 1044 .driver = {
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index 97d45e5115e2..f30150d71be9 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -99,7 +99,7 @@ static struct epd_frame epd_frame_table[] = {
99 }, 99 },
100}; 100};
101 101
102static struct fb_fix_screeninfo metronomefb_fix __devinitdata = { 102static struct fb_fix_screeninfo metronomefb_fix = {
103 .id = "metronomefb", 103 .id = "metronomefb",
104 .type = FB_TYPE_PACKED_PIXELS, 104 .type = FB_TYPE_PACKED_PIXELS,
105 .visual = FB_VISUAL_STATIC_PSEUDOCOLOR, 105 .visual = FB_VISUAL_STATIC_PSEUDOCOLOR,
@@ -110,7 +110,7 @@ static struct fb_fix_screeninfo metronomefb_fix __devinitdata = {
110 .accel = FB_ACCEL_NONE, 110 .accel = FB_ACCEL_NONE,
111}; 111};
112 112
113static struct fb_var_screeninfo metronomefb_var __devinitdata = { 113static struct fb_var_screeninfo metronomefb_var = {
114 .xres = DPY_W, 114 .xres = DPY_W,
115 .yres = DPY_H, 115 .yres = DPY_H,
116 .xres_virtual = DPY_W, 116 .xres_virtual = DPY_W,
@@ -167,8 +167,8 @@ static u16 calc_img_cksum(u16 *start, int length)
167} 167}
168 168
169/* here we decode the incoming waveform file and populate metromem */ 169/* here we decode the incoming waveform file and populate metromem */
170static int __devinit load_waveform(u8 *mem, size_t size, int m, int t, 170static int load_waveform(u8 *mem, size_t size, int m, int t,
171 struct metronomefb_par *par) 171 struct metronomefb_par *par)
172{ 172{
173 int tta; 173 int tta;
174 int wmta; 174 int wmta;
@@ -338,7 +338,7 @@ static int metronome_display_cmd(struct metronomefb_par *par)
338 return par->board->met_wait_event_intr(par); 338 return par->board->met_wait_event_intr(par);
339} 339}
340 340
341static int __devinit metronome_powerup_cmd(struct metronomefb_par *par) 341static int metronome_powerup_cmd(struct metronomefb_par *par)
342{ 342{
343 int i; 343 int i;
344 u16 cs; 344 u16 cs;
@@ -367,7 +367,7 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
367 return par->board->met_wait_event(par); 367 return par->board->met_wait_event(par);
368} 368}
369 369
370static int __devinit metronome_config_cmd(struct metronomefb_par *par) 370static int metronome_config_cmd(struct metronomefb_par *par)
371{ 371{
372 /* setup config command 372 /* setup config command
373 we can't immediately set the opcode since the controller 373 we can't immediately set the opcode since the controller
@@ -385,7 +385,7 @@ static int __devinit metronome_config_cmd(struct metronomefb_par *par)
385 return par->board->met_wait_event(par); 385 return par->board->met_wait_event(par);
386} 386}
387 387
388static int __devinit metronome_init_cmd(struct metronomefb_par *par) 388static int metronome_init_cmd(struct metronomefb_par *par)
389{ 389{
390 int i; 390 int i;
391 u16 cs; 391 u16 cs;
@@ -411,7 +411,7 @@ static int __devinit metronome_init_cmd(struct metronomefb_par *par)
411 return par->board->met_wait_event(par); 411 return par->board->met_wait_event(par);
412} 412}
413 413
414static int __devinit metronome_init_regs(struct metronomefb_par *par) 414static int metronome_init_regs(struct metronomefb_par *par)
415{ 415{
416 int res; 416 int res;
417 417
@@ -569,7 +569,7 @@ static struct fb_deferred_io metronomefb_defio = {
569 .deferred_io = metronomefb_dpy_deferred_io, 569 .deferred_io = metronomefb_dpy_deferred_io,
570}; 570};
571 571
572static int __devinit metronomefb_probe(struct platform_device *dev) 572static int metronomefb_probe(struct platform_device *dev)
573{ 573{
574 struct fb_info *info; 574 struct fb_info *info;
575 struct metronome_board *board; 575 struct metronome_board *board;
@@ -741,7 +741,7 @@ err:
741 return retval; 741 return retval;
742} 742}
743 743
744static int __devexit metronomefb_remove(struct platform_device *dev) 744static int metronomefb_remove(struct platform_device *dev)
745{ 745{
746 struct fb_info *info = platform_get_drvdata(dev); 746 struct fb_info *info = platform_get_drvdata(dev);
747 747
@@ -763,7 +763,7 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
763 763
764static struct platform_driver metronomefb_driver = { 764static struct platform_driver metronomefb_driver = {
765 .probe = metronomefb_probe, 765 .probe = metronomefb_probe,
766 .remove = __devexit_p(metronomefb_remove), 766 .remove = metronomefb_remove,
767 .driver = { 767 .driver = {
768 .owner = THIS_MODULE, 768 .owner = THIS_MODULE,
769 .name = "metronomefb", 769 .name = "metronomefb",
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index 35ac9e8bee63..e0f8011a3c4b 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -417,7 +417,7 @@ static void mddi_resume(struct msm_mddi_client_data *cdata)
417 mddi_set_auto_hibernate(&mddi->client_data, 1); 417 mddi_set_auto_hibernate(&mddi->client_data, 1);
418} 418}
419 419
420static int __devinit mddi_get_client_caps(struct mddi_info *mddi) 420static int mddi_get_client_caps(struct mddi_info *mddi)
421{ 421{
422 int i, j; 422 int i, j;
423 423
@@ -619,9 +619,8 @@ uint32_t mddi_remote_read(struct msm_mddi_client_data *cdata, uint32_t reg)
619 619
620static struct mddi_info mddi_info[2]; 620static struct mddi_info mddi_info[2];
621 621
622static int __devinit mddi_clk_setup(struct platform_device *pdev, 622static int mddi_clk_setup(struct platform_device *pdev, struct mddi_info *mddi,
623 struct mddi_info *mddi, 623 unsigned long clk_rate)
624 unsigned long clk_rate)
625{ 624{
626 int ret; 625 int ret;
627 626
@@ -664,7 +663,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi)
664 return 0; 663 return 0;
665} 664}
666 665
667static int __devinit mddi_probe(struct platform_device *pdev) 666static int mddi_probe(struct platform_device *pdev)
668{ 667{
669 struct msm_mddi_platform_data *pdata = pdev->dev.platform_data; 668 struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
670 struct mddi_info *mddi = &mddi_info[pdev->id]; 669 struct mddi_info *mddi = &mddi_info[pdev->id];
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 49619b441500..a45b37c2e88e 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -586,7 +586,7 @@ static struct fb_ops mxsfb_ops = {
586 .fb_imageblit = cfb_imageblit, 586 .fb_imageblit = cfb_imageblit,
587}; 587};
588 588
589static int __devinit mxsfb_restore_mode(struct mxsfb_info *host) 589static int mxsfb_restore_mode(struct mxsfb_info *host)
590{ 590{
591 struct fb_info *fb_info = &host->fb_info; 591 struct fb_info *fb_info = &host->fb_info;
592 unsigned line_count; 592 unsigned line_count;
@@ -677,7 +677,7 @@ static int __devinit mxsfb_restore_mode(struct mxsfb_info *host)
677 return 0; 677 return 0;
678} 678}
679 679
680static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host) 680static int mxsfb_init_fbinfo(struct mxsfb_info *host)
681{ 681{
682 struct fb_info *fb_info = &host->fb_info; 682 struct fb_info *fb_info = &host->fb_info;
683 struct fb_var_screeninfo *var = &fb_info->var; 683 struct fb_var_screeninfo *var = &fb_info->var;
@@ -739,7 +739,7 @@ static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host)
739 return 0; 739 return 0;
740} 740}
741 741
742static void __devexit mxsfb_free_videomem(struct mxsfb_info *host) 742static void mxsfb_free_videomem(struct mxsfb_info *host)
743{ 743{
744 struct fb_info *fb_info = &host->fb_info; 744 struct fb_info *fb_info = &host->fb_info;
745 745
@@ -772,7 +772,7 @@ static const struct of_device_id mxsfb_dt_ids[] = {
772}; 772};
773MODULE_DEVICE_TABLE(of, mxsfb_dt_ids); 773MODULE_DEVICE_TABLE(of, mxsfb_dt_ids);
774 774
775static int __devinit mxsfb_probe(struct platform_device *pdev) 775static int mxsfb_probe(struct platform_device *pdev)
776{ 776{
777 const struct of_device_id *of_id = 777 const struct of_device_id *of_id =
778 of_match_device(mxsfb_dt_ids, &pdev->dev); 778 of_match_device(mxsfb_dt_ids, &pdev->dev);
@@ -912,7 +912,7 @@ error_alloc_info:
912 return ret; 912 return ret;
913} 913}
914 914
915static int __devexit mxsfb_remove(struct platform_device *pdev) 915static int mxsfb_remove(struct platform_device *pdev)
916{ 916{
917 struct fb_info *fb_info = platform_get_drvdata(pdev); 917 struct fb_info *fb_info = platform_get_drvdata(pdev);
918 struct mxsfb_info *host = to_imxfb_host(fb_info); 918 struct mxsfb_info *host = to_imxfb_host(fb_info);
@@ -949,7 +949,7 @@ static void mxsfb_shutdown(struct platform_device *pdev)
949 949
950static struct platform_driver mxsfb_driver = { 950static struct platform_driver mxsfb_driver = {
951 .probe = mxsfb_probe, 951 .probe = mxsfb_probe,
952 .remove = __devexit_p(mxsfb_remove), 952 .remove = mxsfb_remove,
953 .shutdown = mxsfb_shutdown, 953 .shutdown = mxsfb_shutdown,
954 .id_table = mxsfb_devtype, 954 .id_table = mxsfb_devtype,
955 .driver = { 955 .driver = {
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index afc9521173ef..7ef079c146e7 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -88,7 +88,7 @@ static bool external;
88static bool libretto; 88static bool libretto;
89static bool nostretch; 89static bool nostretch;
90static bool nopciburst; 90static bool nopciburst;
91static char *mode_option __devinitdata = NULL; 91static char *mode_option = NULL;
92 92
93#ifdef MODULE 93#ifdef MODULE
94 94
@@ -1632,7 +1632,7 @@ static struct fb_ops neofb_ops = {
1632 1632
1633/* --------------------------------------------------------------------- */ 1633/* --------------------------------------------------------------------- */
1634 1634
1635static struct fb_videomode __devinitdata mode800x480 = { 1635static struct fb_videomode mode800x480 = {
1636 .xres = 800, 1636 .xres = 800,
1637 .yres = 480, 1637 .yres = 480,
1638 .pixclock = 25000, 1638 .pixclock = 25000,
@@ -1646,8 +1646,7 @@ static struct fb_videomode __devinitdata mode800x480 = {
1646 .vmode = FB_VMODE_NONINTERLACED 1646 .vmode = FB_VMODE_NONINTERLACED
1647}; 1647};
1648 1648
1649static int __devinit neo_map_mmio(struct fb_info *info, 1649static int neo_map_mmio(struct fb_info *info, struct pci_dev *dev)
1650 struct pci_dev *dev)
1651{ 1650{
1652 struct neofb_par *par = info->par; 1651 struct neofb_par *par = info->par;
1653 1652
@@ -1707,8 +1706,8 @@ static void neo_unmap_mmio(struct fb_info *info)
1707 info->fix.mmio_len); 1706 info->fix.mmio_len);
1708} 1707}
1709 1708
1710static int __devinit neo_map_video(struct fb_info *info, 1709static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
1711 struct pci_dev *dev, int video_len) 1710 int video_len)
1712{ 1711{
1713 //unsigned long addr; 1712 //unsigned long addr;
1714 1713
@@ -1772,7 +1771,7 @@ static void neo_unmap_video(struct fb_info *info)
1772 info->fix.smem_len); 1771 info->fix.smem_len);
1773} 1772}
1774 1773
1775static int __devinit neo_scan_monitor(struct fb_info *info) 1774static int neo_scan_monitor(struct fb_info *info)
1776{ 1775{
1777 struct neofb_par *par = info->par; 1776 struct neofb_par *par = info->par;
1778 unsigned char type, display; 1777 unsigned char type, display;
@@ -1851,7 +1850,7 @@ static int __devinit neo_scan_monitor(struct fb_info *info)
1851 return 0; 1850 return 0;
1852} 1851}
1853 1852
1854static int __devinit neo_init_hw(struct fb_info *info) 1853static int neo_init_hw(struct fb_info *info)
1855{ 1854{
1856 struct neofb_par *par = info->par; 1855 struct neofb_par *par = info->par;
1857 int videoRam = 896; 1856 int videoRam = 896;
@@ -1939,8 +1938,8 @@ static int __devinit neo_init_hw(struct fb_info *info)
1939} 1938}
1940 1939
1941 1940
1942static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const struct 1941static struct fb_info *neo_alloc_fb_info(struct pci_dev *dev,
1943 pci_device_id *id) 1942 const struct pci_device_id *id)
1944{ 1943{
1945 struct fb_info *info; 1944 struct fb_info *info;
1946 struct neofb_par *par; 1945 struct neofb_par *par;
@@ -2038,8 +2037,7 @@ static void neo_free_fb_info(struct fb_info *info)
2038 2037
2039/* --------------------------------------------------------------------- */ 2038/* --------------------------------------------------------------------- */
2040 2039
2041static int __devinit neofb_probe(struct pci_dev *dev, 2040static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id)
2042 const struct pci_device_id *id)
2043{ 2041{
2044 struct fb_info *info; 2042 struct fb_info *info;
2045 u_int h_sync, v_sync; 2043 u_int h_sync, v_sync;
@@ -2128,7 +2126,7 @@ err_map_mmio:
2128 return err; 2126 return err;
2129} 2127}
2130 2128
2131static void __devexit neofb_remove(struct pci_dev *dev) 2129static void neofb_remove(struct pci_dev *dev)
2132{ 2130{
2133 struct fb_info *info = pci_get_drvdata(dev); 2131 struct fb_info *info = pci_get_drvdata(dev);
2134 2132
@@ -2194,7 +2192,7 @@ static struct pci_driver neofb_driver = {
2194 .name = "neofb", 2192 .name = "neofb",
2195 .id_table = neofb_devices, 2193 .id_table = neofb_devices,
2196 .probe = neofb_probe, 2194 .probe = neofb_probe,
2197 .remove = __devexit_p(neofb_remove) 2195 .remove = neofb_remove,
2198}; 2196};
2199 2197
2200/* ************************* init in-kernel code ************************** */ 2198/* ************************* init in-kernel code ************************** */
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 475dfee82c4a..32581c72ad09 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -387,7 +387,7 @@ static int nuc900fb_init_registers(struct fb_info *info)
387 * The buffer should be a non-cached, non-buffered, memory region 387 * The buffer should be a non-cached, non-buffered, memory region
388 * to allow palette and pixel writes without flushing the cache. 388 * to allow palette and pixel writes without flushing the cache.
389 */ 389 */
390static int __devinit nuc900fb_map_video_memory(struct fb_info *info) 390static int nuc900fb_map_video_memory(struct fb_info *info)
391{ 391{
392 struct nuc900fb_info *fbi = info->par; 392 struct nuc900fb_info *fbi = info->par;
393 dma_addr_t map_dma; 393 dma_addr_t map_dma;
@@ -499,7 +499,7 @@ static inline void nuc900fb_cpufreq_deregister(struct nuc900fb_info *info)
499 499
500static char driver_name[] = "nuc900fb"; 500static char driver_name[] = "nuc900fb";
501 501
502static int __devinit nuc900fb_probe(struct platform_device *pdev) 502static int nuc900fb_probe(struct platform_device *pdev)
503{ 503{
504 struct nuc900fb_info *fbi; 504 struct nuc900fb_info *fbi;
505 struct nuc900fb_display *display; 505 struct nuc900fb_display *display;
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index fe13ac567d54..ff228713425e 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -70,34 +70,34 @@ static struct pci_device_id nvidiafb_pci_tbl[] = {
70MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl); 70MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl);
71 71
72/* command line data, set in nvidiafb_setup() */ 72/* command line data, set in nvidiafb_setup() */
73static int flatpanel __devinitdata = -1; /* Autodetect later */ 73static int flatpanel = -1; /* Autodetect later */
74static int fpdither __devinitdata = -1; 74static int fpdither = -1;
75static int forceCRTC __devinitdata = -1; 75static int forceCRTC = -1;
76static int hwcur __devinitdata = 0; 76static int hwcur = 0;
77static int noaccel __devinitdata = 0; 77static int noaccel = 0;
78static int noscale __devinitdata = 0; 78static int noscale = 0;
79static int paneltweak __devinitdata = 0; 79static int paneltweak = 0;
80static int vram __devinitdata = 0; 80static int vram = 0;
81static int bpp __devinitdata = 8; 81static int bpp = 8;
82static int reverse_i2c __devinitdata; 82static int reverse_i2c;
83#ifdef CONFIG_MTRR 83#ifdef CONFIG_MTRR
84static bool nomtrr __devinitdata = false; 84static bool nomtrr = false;
85#endif 85#endif
86#ifdef CONFIG_PMAC_BACKLIGHT 86#ifdef CONFIG_PMAC_BACKLIGHT
87static int backlight __devinitdata = 1; 87static int backlight = 1;
88#else 88#else
89static int backlight __devinitdata = 0; 89static int backlight = 0;
90#endif 90#endif
91 91
92static char *mode_option __devinitdata = NULL; 92static char *mode_option = NULL;
93 93
94static struct fb_fix_screeninfo __devinitdata nvidiafb_fix = { 94static struct fb_fix_screeninfo nvidiafb_fix = {
95 .type = FB_TYPE_PACKED_PIXELS, 95 .type = FB_TYPE_PACKED_PIXELS,
96 .xpanstep = 8, 96 .xpanstep = 8,
97 .ypanstep = 1, 97 .ypanstep = 1,
98}; 98};
99 99
100static struct fb_var_screeninfo __devinitdata nvidiafb_default_var = { 100static struct fb_var_screeninfo nvidiafb_default_var = {
101 .xres = 640, 101 .xres = 640,
102 .yres = 480, 102 .yres = 480,
103 .xres_virtual = 640, 103 .xres_virtual = 640,
@@ -1105,7 +1105,7 @@ fail:
1105#define nvidiafb_resume NULL 1105#define nvidiafb_resume NULL
1106#endif 1106#endif
1107 1107
1108static int __devinit nvidia_set_fbinfo(struct fb_info *info) 1108static int nvidia_set_fbinfo(struct fb_info *info)
1109{ 1109{
1110 struct fb_monspecs *specs = &info->monspecs; 1110 struct fb_monspecs *specs = &info->monspecs;
1111 struct fb_videomode modedb; 1111 struct fb_videomode modedb;
@@ -1201,7 +1201,7 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
1201 return nvidiafb_check_var(&info->var, info); 1201 return nvidiafb_check_var(&info->var, info);
1202} 1202}
1203 1203
1204static u32 __devinit nvidia_get_chipset(struct fb_info *info) 1204static u32 nvidia_get_chipset(struct fb_info *info)
1205{ 1205{
1206 struct nvidia_par *par = info->par; 1206 struct nvidia_par *par = info->par;
1207 u32 id = (par->pci_dev->vendor << 16) | par->pci_dev->device; 1207 u32 id = (par->pci_dev->vendor << 16) | par->pci_dev->device;
@@ -1224,7 +1224,7 @@ static u32 __devinit nvidia_get_chipset(struct fb_info *info)
1224 return id; 1224 return id;
1225} 1225}
1226 1226
1227static u32 __devinit nvidia_get_arch(struct fb_info *info) 1227static u32 nvidia_get_arch(struct fb_info *info)
1228{ 1228{
1229 struct nvidia_par *par = info->par; 1229 struct nvidia_par *par = info->par;
1230 u32 arch = 0; 1230 u32 arch = 0;
@@ -1276,8 +1276,7 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
1276 return arch; 1276 return arch;
1277} 1277}
1278 1278
1279static int __devinit nvidiafb_probe(struct pci_dev *pd, 1279static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
1280 const struct pci_device_id *ent)
1281{ 1280{
1282 struct nvidia_par *par; 1281 struct nvidia_par *par;
1283 struct fb_info *info; 1282 struct fb_info *info;
@@ -1438,7 +1437,7 @@ err_out:
1438 return -ENODEV; 1437 return -ENODEV;
1439} 1438}
1440 1439
1441static void __devexit nvidiafb_remove(struct pci_dev *pd) 1440static void nvidiafb_remove(struct pci_dev *pd)
1442{ 1441{
1443 struct fb_info *info = pci_get_drvdata(pd); 1442 struct fb_info *info = pci_get_drvdata(pd);
1444 struct nvidia_par *par = info->par; 1443 struct nvidia_par *par = info->par;
@@ -1473,7 +1472,7 @@ static void __devexit nvidiafb_remove(struct pci_dev *pd)
1473 * ------------------------------------------------------------------------- */ 1472 * ------------------------------------------------------------------------- */
1474 1473
1475#ifndef MODULE 1474#ifndef MODULE
1476static int __devinit nvidiafb_setup(char *options) 1475static int nvidiafb_setup(char *options)
1477{ 1476{
1478 char *this_opt; 1477 char *this_opt;
1479 1478
@@ -1529,7 +1528,7 @@ static struct pci_driver nvidiafb_driver = {
1529 .probe = nvidiafb_probe, 1528 .probe = nvidiafb_probe,
1530 .suspend = nvidiafb_suspend, 1529 .suspend = nvidiafb_suspend,
1531 .resume = nvidiafb_resume, 1530 .resume = nvidiafb_resume,
1532 .remove = __devexit_p(nvidiafb_remove), 1531 .remove = nvidiafb_remove,
1533}; 1532};
1534 1533
1535/* ------------------------------------------------------------------------- * 1534/* ------------------------------------------------------------------------- *
@@ -1538,7 +1537,7 @@ static struct pci_driver nvidiafb_driver = {
1538 * 1537 *
1539 * ------------------------------------------------------------------------- */ 1538 * ------------------------------------------------------------------------- */
1540 1539
1541static int __devinit nvidiafb_init(void) 1540static int nvidiafb_init(void)
1542{ 1541{
1543#ifndef MODULE 1542#ifndef MODULE
1544 char *option = NULL; 1543 char *option = NULL;
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index b739600c51ac..803fee618d57 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -606,7 +606,7 @@ static struct spi_driver mipid_spi_driver = {
606 .owner = THIS_MODULE, 606 .owner = THIS_MODULE,
607 }, 607 },
608 .probe = mipid_spi_probe, 608 .probe = mipid_spi_probe,
609 .remove = __devexit_p(mipid_spi_remove), 609 .remove = mipid_spi_remove,
610}; 610};
611 611
612module_spi_driver(mipid_spi_driver); 612module_spi_driver(mipid_spi_driver);
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index 65eb76c840a1..72699f88c002 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -777,7 +777,7 @@ static struct spi_driver acx565akm_spi_driver = {
777 .owner = THIS_MODULE, 777 .owner = THIS_MODULE,
778 }, 778 },
779 .probe = acx565akm_spi_probe, 779 .probe = acx565akm_spi_probe,
780 .remove = __devexit_p(acx565akm_spi_remove), 780 .remove = acx565akm_spi_remove,
781}; 781};
782 782
783module_spi_driver(acx565akm_spi_driver); 783module_spi_driver(acx565akm_spi_driver);
diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
index ace419b801eb..6e5abe8fd2dd 100644
--- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
@@ -216,13 +216,13 @@ static void init_lb035q02_panel(struct spi_device *spi)
216 lb035q02_write_reg(spi, 0x3b, 0x0806); 216 lb035q02_write_reg(spi, 0x3b, 0x0806);
217} 217}
218 218
219static int __devinit lb035q02_panel_spi_probe(struct spi_device *spi) 219static int lb035q02_panel_spi_probe(struct spi_device *spi)
220{ 220{
221 init_lb035q02_panel(spi); 221 init_lb035q02_panel(spi);
222 return omap_dss_register_driver(&lb035q02_driver); 222 return omap_dss_register_driver(&lb035q02_driver);
223} 223}
224 224
225static int __devexit lb035q02_panel_spi_remove(struct spi_device *spi) 225static int lb035q02_panel_spi_remove(struct spi_device *spi)
226{ 226{
227 omap_dss_unregister_driver(&lb035q02_driver); 227 omap_dss_unregister_driver(&lb035q02_driver);
228 return 0; 228 return 0;
@@ -234,7 +234,7 @@ static struct spi_driver lb035q02_spi_driver = {
234 .owner = THIS_MODULE, 234 .owner = THIS_MODULE,
235 }, 235 },
236 .probe = lb035q02_panel_spi_probe, 236 .probe = lb035q02_panel_spi_probe,
237 .remove = __devexit_p(lb035q02_panel_spi_remove), 237 .remove = lb035q02_panel_spi_remove,
238}; 238};
239 239
240module_spi_driver(lb035q02_spi_driver); 240module_spi_driver(lb035q02_spi_driver);
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index d1cb722fcdbc..dd1294750802 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -680,7 +680,7 @@ static struct spi_driver mipid_spi_driver = {
680 .owner = THIS_MODULE, 680 .owner = THIS_MODULE,
681 }, 681 },
682 .probe = mipid_spi_probe, 682 .probe = mipid_spi_probe,
683 .remove = __devexit_p(mipid_spi_remove), 683 .remove = mipid_spi_remove,
684}; 684};
685module_spi_driver(mipid_spi_driver); 685module_spi_driver(mipid_spi_driver);
686 686
diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
index 2a79c283bebe..c4e9c2b1b465 100644
--- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
+++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -323,7 +323,7 @@ static int nec_8048_spi_resume(struct spi_device *spi)
323 323
324static struct spi_driver nec_8048_spi_driver = { 324static struct spi_driver nec_8048_spi_driver = {
325 .probe = nec_8048_spi_probe, 325 .probe = nec_8048_spi_probe,
326 .remove = __devexit_p(nec_8048_spi_remove), 326 .remove = nec_8048_spi_remove,
327 .suspend = nec_8048_spi_suspend, 327 .suspend = nec_8048_spi_suspend,
328 .resume = nec_8048_spi_resume, 328 .resume = nec_8048_spi_resume,
329 .driver = { 329 .driver = {
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index 316b3da6d2cb..6b6643911d29 100644
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -528,7 +528,7 @@ static int tpo_td043_spi_probe(struct spi_device *spi)
528 return 0; 528 return 0;
529} 529}
530 530
531static int __devexit tpo_td043_spi_remove(struct spi_device *spi) 531static int tpo_td043_spi_remove(struct spi_device *spi)
532{ 532{
533 struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&spi->dev); 533 struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&spi->dev);
534 534
@@ -580,7 +580,7 @@ static struct spi_driver tpo_td043_spi_driver = {
580 .pm = &tpo_td043_spi_pm, 580 .pm = &tpo_td043_spi_pm,
581 }, 581 },
582 .probe = tpo_td043_spi_probe, 582 .probe = tpo_td043_spi_probe,
583 .remove = __devexit_p(tpo_td043_spi_remove), 583 .remove = tpo_td043_spi_remove,
584}; 584};
585 585
586module_spi_driver(tpo_td043_spi_driver); 586module_spi_driver(tpo_td043_spi_driver);
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index d57cc58c5168..4b23af6e5c28 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -249,7 +249,7 @@ static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_no
249 info->fix.accel = FB_ACCEL_SUN_CGTHREE; 249 info->fix.accel = FB_ACCEL_SUN_CGTHREE;
250} 250}
251 251
252static int __devinit p9100_probe(struct platform_device *op) 252static int p9100_probe(struct platform_device *op)
253{ 253{
254 struct device_node *dp = op->dev.of_node; 254 struct device_node *dp = op->dev.of_node;
255 struct fb_info *info; 255 struct fb_info *info;
@@ -326,7 +326,7 @@ out_err:
326 return err; 326 return err;
327} 327}
328 328
329static int __devexit p9100_remove(struct platform_device *op) 329static int p9100_remove(struct platform_device *op)
330{ 330{
331 struct fb_info *info = dev_get_drvdata(&op->dev); 331 struct fb_info *info = dev_get_drvdata(&op->dev);
332 struct p9100_par *par = info->par; 332 struct p9100_par *par = info->par;
@@ -359,7 +359,7 @@ static struct platform_driver p9100_driver = {
359 .of_match_table = p9100_match, 359 .of_match_table = p9100_match,
360 }, 360 },
361 .probe = p9100_probe, 361 .probe = p9100_probe,
362 .remove = __devexit_p(p9100_remove), 362 .remove = p9100_remove,
363}; 363};
364 364
365static int __init p9100_init(void) 365static int __init p9100_init(void)
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index ae3caa6755c2..3d86bac62d3e 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -313,7 +313,8 @@ static void platinum_set_hardware(struct fb_info_platinum *pinfo)
313/* 313/*
314 * Set misc info vars for this driver 314 * Set misc info vars for this driver
315 */ 315 */
316static void __devinit platinum_init_info(struct fb_info *info, struct fb_info_platinum *pinfo) 316static void platinum_init_info(struct fb_info *info,
317 struct fb_info_platinum *pinfo)
317{ 318{
318 /* Fill fb_info */ 319 /* Fill fb_info */
319 info->fbops = &platinumfb_ops; 320 info->fbops = &platinumfb_ops;
@@ -338,7 +339,7 @@ static void __devinit platinum_init_info(struct fb_info *info, struct fb_info_pl
338} 339}
339 340
340 341
341static int __devinit platinum_init_fb(struct fb_info *info) 342static int platinum_init_fb(struct fb_info *info)
342{ 343{
343 struct fb_info_platinum *pinfo = info->par; 344 struct fb_info_platinum *pinfo = info->par;
344 struct fb_var_screeninfo var; 345 struct fb_var_screeninfo var;
@@ -533,7 +534,7 @@ static int __init platinumfb_setup(char *options)
533#define invalidate_cache(addr) 534#define invalidate_cache(addr)
534#endif 535#endif
535 536
536static int __devinit platinumfb_probe(struct platform_device* odev) 537static int platinumfb_probe(struct platform_device* odev)
537{ 538{
538 struct device_node *dp = odev->dev.of_node; 539 struct device_node *dp = odev->dev.of_node;
539 struct fb_info *info; 540 struct fb_info *info;
@@ -645,7 +646,7 @@ static int __devinit platinumfb_probe(struct platform_device* odev)
645 return rc; 646 return rc;
646} 647}
647 648
648static int __devexit platinumfb_remove(struct platform_device* odev) 649static int platinumfb_remove(struct platform_device* odev)
649{ 650{
650 struct fb_info *info = dev_get_drvdata(&odev->dev); 651 struct fb_info *info = dev_get_drvdata(&odev->dev);
651 struct fb_info_platinum *pinfo = info->par; 652 struct fb_info_platinum *pinfo = info->par;
@@ -683,7 +684,7 @@ static struct platform_driver platinum_driver =
683 .of_match_table = platinumfb_match, 684 .of_match_table = platinumfb_match,
684 }, 685 },
685 .probe = platinumfb_probe, 686 .probe = platinumfb_probe,
686 .remove = __devexit_p(platinumfb_remove), 687 .remove = platinumfb_remove,
687}; 688};
688 689
689static int __init platinumfb_init(void) 690static int __init platinumfb_init(void)
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index df31a24a5026..81354eeab021 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -67,7 +67,7 @@
67 * Driver data 67 * Driver data
68 */ 68 */
69static int hwcursor = 1; 69static int hwcursor = 1;
70static char *mode_option __devinitdata; 70static char *mode_option;
71 71
72/* 72/*
73 * The XFree GLINT driver will (I think to implement hardware cursor 73 * The XFree GLINT driver will (I think to implement hardware cursor
@@ -80,10 +80,10 @@ static char *mode_option __devinitdata;
80 */ 80 */
81static bool lowhsync; 81static bool lowhsync;
82static bool lowvsync; 82static bool lowvsync;
83static bool noaccel __devinitdata; 83static bool noaccel;
84/* mtrr option */ 84/* mtrr option */
85#ifdef CONFIG_MTRR 85#ifdef CONFIG_MTRR
86static bool nomtrr __devinitdata; 86static bool nomtrr;
87#endif 87#endif
88 88
89/* 89/*
@@ -107,7 +107,7 @@ struct pm2fb_par
107 * Here we define the default structs fb_fix_screeninfo and fb_var_screeninfo 107 * Here we define the default structs fb_fix_screeninfo and fb_var_screeninfo
108 * if we don't use modedb. 108 * if we don't use modedb.
109 */ 109 */
110static struct fb_fix_screeninfo pm2fb_fix __devinitdata = { 110static struct fb_fix_screeninfo pm2fb_fix = {
111 .id = "", 111 .id = "",
112 .type = FB_TYPE_PACKED_PIXELS, 112 .type = FB_TYPE_PACKED_PIXELS,
113 .visual = FB_VISUAL_PSEUDOCOLOR, 113 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -120,7 +120,7 @@ static struct fb_fix_screeninfo pm2fb_fix __devinitdata = {
120/* 120/*
121 * Default video mode. In case the modedb doesn't work. 121 * Default video mode. In case the modedb doesn't work.
122 */ 122 */
123static struct fb_var_screeninfo pm2fb_var __devinitdata = { 123static struct fb_var_screeninfo pm2fb_var = {
124 /* "640x480, 8 bpp @ 60 Hz */ 124 /* "640x480, 8 bpp @ 60 Hz */
125 .xres = 640, 125 .xres = 640,
126 .yres = 480, 126 .yres = 480,
@@ -1515,8 +1515,7 @@ static struct fb_ops pm2fb_ops = {
1515 * @param pdev PCI device. 1515 * @param pdev PCI device.
1516 * @param id PCI device ID. 1516 * @param id PCI device ID.
1517 */ 1517 */
1518static int __devinit pm2fb_probe(struct pci_dev *pdev, 1518static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1519 const struct pci_device_id *id)
1520{ 1519{
1521 struct pm2fb_par *default_par; 1520 struct pm2fb_par *default_par;
1522 struct fb_info *info; 1521 struct fb_info *info;
@@ -1727,7 +1726,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
1727 * 1726 *
1728 * @param pdev PCI device to clean up. 1727 * @param pdev PCI device to clean up.
1729 */ 1728 */
1730static void __devexit pm2fb_remove(struct pci_dev *pdev) 1729static void pm2fb_remove(struct pci_dev *pdev)
1731{ 1730{
1732 struct fb_info *info = pci_get_drvdata(pdev); 1731 struct fb_info *info = pci_get_drvdata(pdev);
1733 struct fb_fix_screeninfo *fix = &info->fix; 1732 struct fb_fix_screeninfo *fix = &info->fix;
@@ -1765,7 +1764,7 @@ static struct pci_driver pm2fb_driver = {
1765 .name = "pm2fb", 1764 .name = "pm2fb",
1766 .id_table = pm2fb_id_table, 1765 .id_table = pm2fb_id_table,
1767 .probe = pm2fb_probe, 1766 .probe = pm2fb_probe,
1768 .remove = __devexit_p(pm2fb_remove), 1767 .remove = pm2fb_remove,
1769}; 1768};
1770 1769
1771MODULE_DEVICE_TABLE(pci, pm2fb_id_table); 1770MODULE_DEVICE_TABLE(pci, pm2fb_id_table);
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 055e527a8e45..7718faa4a73b 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -56,12 +56,12 @@
56 * Driver data 56 * Driver data
57 */ 57 */
58static int hwcursor = 1; 58static int hwcursor = 1;
59static char *mode_option __devinitdata; 59static char *mode_option;
60static bool noaccel __devinitdata; 60static bool noaccel;
61 61
62/* mtrr option */ 62/* mtrr option */
63#ifdef CONFIG_MTRR 63#ifdef CONFIG_MTRR
64static bool nomtrr __devinitdata; 64static bool nomtrr;
65#endif 65#endif
66 66
67/* 67/*
@@ -84,7 +84,7 @@ struct pm3_par {
84 * if we don't use modedb. If we do use modedb see pm3fb_init how to use it 84 * if we don't use modedb. If we do use modedb see pm3fb_init how to use it
85 * to get a fb_var_screeninfo. Otherwise define a default var as well. 85 * to get a fb_var_screeninfo. Otherwise define a default var as well.
86 */ 86 */
87static struct fb_fix_screeninfo pm3fb_fix __devinitdata = { 87static struct fb_fix_screeninfo pm3fb_fix = {
88 .id = "Permedia3", 88 .id = "Permedia3",
89 .type = FB_TYPE_PACKED_PIXELS, 89 .type = FB_TYPE_PACKED_PIXELS,
90 .visual = FB_VISUAL_PSEUDOCOLOR, 90 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -1229,7 +1229,7 @@ static struct fb_ops pm3fb_ops = {
1229 1229
1230/* mmio register are already mapped when this function is called */ 1230/* mmio register are already mapped when this function is called */
1231/* the pm3fb_fix.smem_start is also set */ 1231/* the pm3fb_fix.smem_start is also set */
1232static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par) 1232static unsigned long pm3fb_size_memory(struct pm3_par *par)
1233{ 1233{
1234 unsigned long memsize = 0; 1234 unsigned long memsize = 0;
1235 unsigned long tempBypass, i, temp1, temp2; 1235 unsigned long tempBypass, i, temp1, temp2;
@@ -1314,8 +1314,7 @@ static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par)
1314 return memsize; 1314 return memsize;
1315} 1315}
1316 1316
1317static int __devinit pm3fb_probe(struct pci_dev *dev, 1317static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
1318 const struct pci_device_id *ent)
1319{ 1318{
1320 struct fb_info *info; 1319 struct fb_info *info;
1321 struct pm3_par *par; 1320 struct pm3_par *par;
@@ -1469,7 +1468,7 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
1469 /* 1468 /*
1470 * Cleanup 1469 * Cleanup
1471 */ 1470 */
1472static void __devexit pm3fb_remove(struct pci_dev *dev) 1471static void pm3fb_remove(struct pci_dev *dev)
1473{ 1472{
1474 struct fb_info *info = pci_get_drvdata(dev); 1473 struct fb_info *info = pci_get_drvdata(dev);
1475 1474
@@ -1507,7 +1506,7 @@ static struct pci_driver pm3fb_driver = {
1507 .name = "pm3fb", 1506 .name = "pm3fb",
1508 .id_table = pm3fb_id_table, 1507 .id_table = pm3fb_id_table,
1509 .probe = pm3fb_probe, 1508 .probe = pm3fb_probe,
1510 .remove = __devexit_p(pm3fb_remove), 1509 .remove = pm3fb_remove,
1511}; 1510};
1512 1511
1513MODULE_DEVICE_TABLE(pci, pm3fb_id_table); 1512MODULE_DEVICE_TABLE(pci, pm3fb_id_table);
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index 9b4a60b52a4c..d1e46cedb1f7 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -43,7 +43,7 @@ struct pmagbafb_par {
43}; 43};
44 44
45 45
46static struct fb_var_screeninfo pmagbafb_defined __devinitdata = { 46static struct fb_var_screeninfo pmagbafb_defined = {
47 .xres = 1024, 47 .xres = 1024,
48 .yres = 864, 48 .yres = 864,
49 .xres_virtual = 1024, 49 .xres_virtual = 1024,
@@ -67,7 +67,7 @@ static struct fb_var_screeninfo pmagbafb_defined __devinitdata = {
67 .vmode = FB_VMODE_NONINTERLACED, 67 .vmode = FB_VMODE_NONINTERLACED,
68}; 68};
69 69
70static struct fb_fix_screeninfo pmagbafb_fix __devinitdata = { 70static struct fb_fix_screeninfo pmagbafb_fix = {
71 .id = "PMAG-BA", 71 .id = "PMAG-BA",
72 .smem_len = (1024 * 1024), 72 .smem_len = (1024 * 1024),
73 .type = FB_TYPE_PACKED_PIXELS, 73 .type = FB_TYPE_PACKED_PIXELS,
@@ -141,7 +141,7 @@ static void __init pmagbafb_erase_cursor(struct fb_info *info)
141} 141}
142 142
143 143
144static int __devinit pmagbafb_probe(struct device *dev) 144static int pmagbafb_probe(struct device *dev)
145{ 145{
146 struct tc_dev *tdev = to_tc_dev(dev); 146 struct tc_dev *tdev = to_tc_dev(dev);
147 resource_size_t start, len; 147 resource_size_t start, len;
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index 4e7a9c46e112..0e1317400328 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -44,7 +44,7 @@ struct pmagbbfb_par {
44}; 44};
45 45
46 46
47static struct fb_var_screeninfo pmagbbfb_defined __devinitdata = { 47static struct fb_var_screeninfo pmagbbfb_defined = {
48 .bits_per_pixel = 8, 48 .bits_per_pixel = 8,
49 .red.length = 8, 49 .red.length = 8,
50 .green.length = 8, 50 .green.length = 8,
@@ -57,7 +57,7 @@ static struct fb_var_screeninfo pmagbbfb_defined __devinitdata = {
57 .vmode = FB_VMODE_NONINTERLACED, 57 .vmode = FB_VMODE_NONINTERLACED,
58}; 58};
59 59
60static struct fb_fix_screeninfo pmagbbfb_fix __devinitdata = { 60static struct fb_fix_screeninfo pmagbbfb_fix = {
61 .id = "PMAGB-BA", 61 .id = "PMAGB-BA",
62 .smem_len = (2048 * 1024), 62 .smem_len = (2048 * 1024),
63 .type = FB_TYPE_PACKED_PIXELS, 63 .type = FB_TYPE_PACKED_PIXELS,
@@ -147,7 +147,7 @@ static void __init pmagbbfb_erase_cursor(struct fb_info *info)
147/* 147/*
148 * Set up screen parameters. 148 * Set up screen parameters.
149 */ 149 */
150static void __devinit pmagbbfb_screen_setup(struct fb_info *info) 150static void pmagbbfb_screen_setup(struct fb_info *info)
151{ 151{
152 struct pmagbbfb_par *par = info->par; 152 struct pmagbbfb_par *par = info->par;
153 153
@@ -179,9 +179,9 @@ static void __devinit pmagbbfb_screen_setup(struct fb_info *info)
179/* 179/*
180 * Determine oscillator configuration. 180 * Determine oscillator configuration.
181 */ 181 */
182static void __devinit pmagbbfb_osc_setup(struct fb_info *info) 182static void pmagbbfb_osc_setup(struct fb_info *info)
183{ 183{
184 static unsigned int pmagbbfb_freqs[] __devinitdata = { 184 static unsigned int pmagbbfb_freqs[] = {
185 130808, 119843, 104000, 92980, 74370, 72800, 185 130808, 119843, 104000, 92980, 74370, 72800,
186 69197, 66000, 65000, 50350, 36000, 32000, 25175 186 69197, 66000, 65000, 50350, 36000, 32000, 25175
187 }; 187 };
@@ -246,7 +246,7 @@ static void __devinit pmagbbfb_osc_setup(struct fb_info *info)
246}; 246};
247 247
248 248
249static int __devinit pmagbbfb_probe(struct device *dev) 249static int pmagbbfb_probe(struct device *dev)
250{ 250{
251 struct tc_dev *tdev = to_tc_dev(dev); 251 struct tc_dev *tdev = to_tc_dev(dev);
252 resource_size_t start, len; 252 resource_size_t start, len;
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 0b340d6ff8a4..920c27bf3947 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -259,7 +259,7 @@ static const struct fb_videomode ps3fb_modedb[] = {
259static int ps3fb_mode; 259static int ps3fb_mode;
260module_param(ps3fb_mode, int, 0); 260module_param(ps3fb_mode, int, 0);
261 261
262static char *mode_option __devinitdata; 262static char *mode_option;
263 263
264static int ps3fb_cmp_mode(const struct fb_videomode *vmode, 264static int ps3fb_cmp_mode(const struct fb_videomode *vmode,
265 const struct fb_var_screeninfo *var) 265 const struct fb_var_screeninfo *var)
@@ -965,7 +965,7 @@ static struct fb_fix_screeninfo ps3fb_fix __initdata = {
965 .accel = FB_ACCEL_NONE, 965 .accel = FB_ACCEL_NONE,
966}; 966};
967 967
968static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) 968static int ps3fb_probe(struct ps3_system_bus_device *dev)
969{ 969{
970 struct fb_info *info; 970 struct fb_info *info;
971 struct ps3fb_par *par; 971 struct ps3fb_par *par;
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index bcd44c32a2ed..df07860563e6 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -112,11 +112,11 @@ enum { VO_PAL, VO_NTSC, VO_VGA };
112enum { PAL_ARGB1555, PAL_RGB565, PAL_ARGB4444, PAL_ARGB8888 }; 112enum { PAL_ARGB1555, PAL_RGB565, PAL_ARGB4444, PAL_ARGB8888 };
113 113
114struct pvr2_params { unsigned int val; char *name; }; 114struct pvr2_params { unsigned int val; char *name; };
115static struct pvr2_params cables[] __devinitdata = { 115static struct pvr2_params cables[] = {
116 { CT_VGA, "VGA" }, { CT_RGB, "RGB" }, { CT_COMPOSITE, "COMPOSITE" }, 116 { CT_VGA, "VGA" }, { CT_RGB, "RGB" }, { CT_COMPOSITE, "COMPOSITE" },
117}; 117};
118 118
119static struct pvr2_params outputs[] __devinitdata = { 119static struct pvr2_params outputs[] = {
120 { VO_PAL, "PAL" }, { VO_NTSC, "NTSC" }, { VO_VGA, "VGA" }, 120 { VO_PAL, "PAL" }, { VO_NTSC, "NTSC" }, { VO_VGA, "VGA" },
121}; 121};
122 122
@@ -145,7 +145,7 @@ static struct pvr2fb_par {
145 145
146static struct fb_info *fb_info; 146static struct fb_info *fb_info;
147 147
148static struct fb_fix_screeninfo pvr2_fix __devinitdata = { 148static struct fb_fix_screeninfo pvr2_fix = {
149 .id = "NEC PowerVR2", 149 .id = "NEC PowerVR2",
150 .type = FB_TYPE_PACKED_PIXELS, 150 .type = FB_TYPE_PACKED_PIXELS,
151 .visual = FB_VISUAL_TRUECOLOR, 151 .visual = FB_VISUAL_TRUECOLOR,
@@ -154,7 +154,7 @@ static struct fb_fix_screeninfo pvr2_fix __devinitdata = {
154 .accel = FB_ACCEL_NONE, 154 .accel = FB_ACCEL_NONE,
155}; 155};
156 156
157static struct fb_var_screeninfo pvr2_var __devinitdata = { 157static struct fb_var_screeninfo pvr2_var = {
158 .xres = 640, 158 .xres = 640,
159 .yres = 480, 159 .yres = 480,
160 .xres_virtual = 640, 160 .xres_virtual = 640,
@@ -226,7 +226,7 @@ static struct fb_ops pvr2fb_ops = {
226 .fb_imageblit = cfb_imageblit, 226 .fb_imageblit = cfb_imageblit,
227}; 227};
228 228
229static struct fb_videomode pvr2_modedb[] __devinitdata = { 229static struct fb_videomode pvr2_modedb[] = {
230 /* 230 /*
231 * Broadcast video modes (PAL and NTSC). I'm unfamiliar with 231 * Broadcast video modes (PAL and NTSC). I'm unfamiliar with
232 * PAL-M and PAL-N, but from what I've read both modes parallel PAL and 232 * PAL-M and PAL-N, but from what I've read both modes parallel PAL and
@@ -256,7 +256,7 @@ static struct fb_videomode pvr2_modedb[] __devinitdata = {
256#define DEFMODE_VGA 2 256#define DEFMODE_VGA 2
257 257
258static int defmode = DEFMODE_NTSC; 258static int defmode = DEFMODE_NTSC;
259static char *mode_option __devinitdata = NULL; 259static char *mode_option = NULL;
260 260
261static inline void pvr2fb_set_pal_type(unsigned int type) 261static inline void pvr2fb_set_pal_type(unsigned int type)
262{ 262{
@@ -763,7 +763,7 @@ out_unmap:
763 * in for flexibility anyways. Who knows, maybe someone has tv-out on a 763 * in for flexibility anyways. Who knows, maybe someone has tv-out on a
764 * PCI-based version of these things ;-) 764 * PCI-based version of these things ;-)
765 */ 765 */
766static int __devinit pvr2fb_common_init(void) 766static int pvr2fb_common_init(void)
767{ 767{
768 struct pvr2fb_par *par = currentpar; 768 struct pvr2fb_par *par = currentpar;
769 unsigned long modememused, rev; 769 unsigned long modememused, rev;
@@ -922,8 +922,8 @@ static void __exit pvr2fb_dc_exit(void)
922#endif /* CONFIG_SH_DREAMCAST */ 922#endif /* CONFIG_SH_DREAMCAST */
923 923
924#ifdef CONFIG_PCI 924#ifdef CONFIG_PCI
925static int __devinit pvr2fb_pci_probe(struct pci_dev *pdev, 925static int pvr2fb_pci_probe(struct pci_dev *pdev,
926 const struct pci_device_id *ent) 926 const struct pci_device_id *ent)
927{ 927{
928 int ret; 928 int ret;
929 929
@@ -953,7 +953,7 @@ static int __devinit pvr2fb_pci_probe(struct pci_dev *pdev,
953 return pvr2fb_common_init(); 953 return pvr2fb_common_init();
954} 954}
955 955
956static void __devexit pvr2fb_pci_remove(struct pci_dev *pdev) 956static void pvr2fb_pci_remove(struct pci_dev *pdev)
957{ 957{
958 if (fb_info->screen_base) { 958 if (fb_info->screen_base) {
959 iounmap(fb_info->screen_base); 959 iounmap(fb_info->screen_base);
@@ -967,7 +967,7 @@ static void __devexit pvr2fb_pci_remove(struct pci_dev *pdev)
967 pci_release_regions(pdev); 967 pci_release_regions(pdev);
968} 968}
969 969
970static struct pci_device_id pvr2fb_pci_tbl[] __devinitdata = { 970static struct pci_device_id pvr2fb_pci_tbl[] = {
971 { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NEON250, 971 { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NEON250,
972 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 972 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
973 { 0, }, 973 { 0, },
@@ -979,7 +979,7 @@ static struct pci_driver pvr2fb_pci_driver = {
979 .name = "pvr2fb", 979 .name = "pvr2fb",
980 .id_table = pvr2fb_pci_tbl, 980 .id_table = pvr2fb_pci_tbl,
981 .probe = pvr2fb_pci_probe, 981 .probe = pvr2fb_pci_probe,
982 .remove = __devexit_p(pvr2fb_pci_remove), 982 .remove = pvr2fb_pci_remove,
983}; 983};
984 984
985static int __init pvr2fb_pci_init(void) 985static int __init pvr2fb_pci_init(void)
@@ -993,8 +993,8 @@ static void __exit pvr2fb_pci_exit(void)
993} 993}
994#endif /* CONFIG_PCI */ 994#endif /* CONFIG_PCI */
995 995
996static int __devinit pvr2_get_param(const struct pvr2_params *p, const char *s, 996static int pvr2_get_param(const struct pvr2_params *p, const char *s, int val,
997 int val, int size) 997 int size)
998{ 998{
999 int i; 999 int i;
1000 1000
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index f146089261f4..aa9bd1f76d60 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -560,7 +560,7 @@ static struct fb_ops pxa168fb_ops = {
560 .fb_imageblit = cfb_imageblit, 560 .fb_imageblit = cfb_imageblit,
561}; 561};
562 562
563static int __devinit pxa168fb_init_mode(struct fb_info *info, 563static int pxa168fb_init_mode(struct fb_info *info,
564 struct pxa168fb_mach_info *mi) 564 struct pxa168fb_mach_info *mi)
565{ 565{
566 struct pxa168fb_info *fbi = info->par; 566 struct pxa168fb_info *fbi = info->par;
@@ -600,7 +600,7 @@ static int __devinit pxa168fb_init_mode(struct fb_info *info,
600 return ret; 600 return ret;
601} 601}
602 602
603static int __devinit pxa168fb_probe(struct platform_device *pdev) 603static int pxa168fb_probe(struct platform_device *pdev)
604{ 604{
605 struct pxa168fb_mach_info *mi; 605 struct pxa168fb_mach_info *mi;
606 struct fb_info *info = 0; 606 struct fb_info *info = 0;
@@ -783,7 +783,7 @@ failed_put_clk:
783 return ret; 783 return ret;
784} 784}
785 785
786static int __devexit pxa168fb_remove(struct platform_device *pdev) 786static int pxa168fb_remove(struct platform_device *pdev)
787{ 787{
788 struct pxa168fb_info *fbi = platform_get_drvdata(pdev); 788 struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
789 struct fb_info *info; 789 struct fb_info *info;
@@ -826,7 +826,7 @@ static struct platform_driver pxa168fb_driver = {
826 .owner = THIS_MODULE, 826 .owner = THIS_MODULE,
827 }, 827 },
828 .probe = pxa168fb_probe, 828 .probe = pxa168fb_probe,
829 .remove = __devexit_p(pxa168fb_remove), 829 .remove = pxa168fb_remove,
830}; 830};
831 831
832module_platform_driver(pxa168fb_driver); 832module_platform_driver(pxa168fb_driver);
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
index 0b4ae0cebeda..6c984eacc7e3 100644
--- a/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@ -574,8 +574,7 @@ free_buffers(struct platform_device *dev,
574 priv->free = NULL; 574 priv->free = NULL;
575} 575}
576 576
577static int __devinit 577static int pxa3xx_gcu_probe(struct platform_device *dev)
578pxa3xx_gcu_probe(struct platform_device *dev)
579{ 578{
580 int i, ret, irq; 579 int i, ret, irq;
581 struct resource *r; 580 struct resource *r;
@@ -714,8 +713,7 @@ err_free_priv:
714 return ret; 713 return ret;
715} 714}
716 715
717static int __devexit 716static int pxa3xx_gcu_remove(struct platform_device *dev)
718pxa3xx_gcu_remove(struct platform_device *dev)
719{ 717{
720 struct pxa3xx_gcu_priv *priv = platform_get_drvdata(dev); 718 struct pxa3xx_gcu_priv *priv = platform_get_drvdata(dev);
721 struct resource *r = priv->resource_mem; 719 struct resource *r = priv->resource_mem;
@@ -737,7 +735,7 @@ pxa3xx_gcu_remove(struct platform_device *dev)
737 735
738static struct platform_driver pxa3xx_gcu_driver = { 736static struct platform_driver pxa3xx_gcu_driver = {
739 .probe = pxa3xx_gcu_probe, 737 .probe = pxa3xx_gcu_probe,
740 .remove = __devexit_p(pxa3xx_gcu_remove), 738 .remove = pxa3xx_gcu_remove,
741 .driver = { 739 .driver = {
742 .owner = THIS_MODULE, 740 .owner = THIS_MODULE,
743 .name = DRV_NAME, 741 .name = DRV_NAME,
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 4fa2ad43fd97..580f80cc586f 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -869,8 +869,8 @@ static struct fb_ops overlay_fb_ops = {
869 .fb_set_par = overlayfb_set_par, 869 .fb_set_par = overlayfb_set_par,
870}; 870};
871 871
872static void __devinit init_pxafb_overlay(struct pxafb_info *fbi, 872static void init_pxafb_overlay(struct pxafb_info *fbi, struct pxafb_layer *ofb,
873 struct pxafb_layer *ofb, int id) 873 int id)
874{ 874{
875 sprintf(ofb->fb.fix.id, "overlay%d", id + 1); 875 sprintf(ofb->fb.fix.id, "overlay%d", id + 1);
876 876
@@ -903,8 +903,8 @@ static inline int pxafb_overlay_supported(void)
903 return 0; 903 return 0;
904} 904}
905 905
906static int __devinit pxafb_overlay_map_video_memory(struct pxafb_info *pxafb, 906static int pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
907 struct pxafb_layer *ofb) 907 struct pxafb_layer *ofb)
908{ 908{
909 /* We assume that user will use at most video_mem_size for overlay fb, 909 /* We assume that user will use at most video_mem_size for overlay fb,
910 * anyway, it's useless to use 16bpp main plane and 24bpp overlay 910 * anyway, it's useless to use 16bpp main plane and 24bpp overlay
@@ -927,7 +927,7 @@ static int __devinit pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
927 return 0; 927 return 0;
928} 928}
929 929
930static void __devinit pxafb_overlay_init(struct pxafb_info *fbi) 930static void pxafb_overlay_init(struct pxafb_info *fbi)
931{ 931{
932 int i, ret; 932 int i, ret;
933 933
@@ -959,7 +959,7 @@ static void __devinit pxafb_overlay_init(struct pxafb_info *fbi)
959 pr_info("PXA Overlay driver loaded successfully!\n"); 959 pr_info("PXA Overlay driver loaded successfully!\n");
960} 960}
961 961
962static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi) 962static void pxafb_overlay_exit(struct pxafb_info *fbi)
963{ 963{
964 int i; 964 int i;
965 965
@@ -1706,7 +1706,7 @@ static const struct dev_pm_ops pxafb_pm_ops = {
1706}; 1706};
1707#endif 1707#endif
1708 1708
1709static int __devinit pxafb_init_video_memory(struct pxafb_info *fbi) 1709static int pxafb_init_video_memory(struct pxafb_info *fbi)
1710{ 1710{
1711 int size = PAGE_ALIGN(fbi->video_mem_size); 1711 int size = PAGE_ALIGN(fbi->video_mem_size);
1712 1712
@@ -1789,7 +1789,7 @@ decode_mode:
1789 fbi->video_mem_size = video_mem_size; 1789 fbi->video_mem_size = video_mem_size;
1790} 1790}
1791 1791
1792static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) 1792static struct pxafb_info *pxafb_init_fbinfo(struct device *dev)
1793{ 1793{
1794 struct pxafb_info *fbi; 1794 struct pxafb_info *fbi;
1795 void *addr; 1795 void *addr;
@@ -1853,7 +1853,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
1853} 1853}
1854 1854
1855#ifdef CONFIG_FB_PXA_PARAMETERS 1855#ifdef CONFIG_FB_PXA_PARAMETERS
1856static int __devinit parse_opt_mode(struct device *dev, const char *this_opt) 1856static int parse_opt_mode(struct device *dev, const char *this_opt)
1857{ 1857{
1858 struct pxafb_mach_info *inf = dev->platform_data; 1858 struct pxafb_mach_info *inf = dev->platform_data;
1859 1859
@@ -1912,7 +1912,7 @@ done:
1912 return 0; 1912 return 0;
1913} 1913}
1914 1914
1915static int __devinit parse_opt(struct device *dev, char *this_opt) 1915static int parse_opt(struct device *dev, char *this_opt)
1916{ 1916{
1917 struct pxafb_mach_info *inf = dev->platform_data; 1917 struct pxafb_mach_info *inf = dev->platform_data;
1918 struct pxafb_mode_info *mode = &inf->modes[0]; 1918 struct pxafb_mode_info *mode = &inf->modes[0];
@@ -2012,7 +2012,7 @@ static int __devinit parse_opt(struct device *dev, char *this_opt)
2012 return 0; 2012 return 0;
2013} 2013}
2014 2014
2015static int __devinit pxafb_parse_options(struct device *dev, char *options) 2015static int pxafb_parse_options(struct device *dev, char *options)
2016{ 2016{
2017 char *this_opt; 2017 char *this_opt;
2018 int ret; 2018 int ret;
@@ -2031,7 +2031,7 @@ static int __devinit pxafb_parse_options(struct device *dev, char *options)
2031 return 0; 2031 return 0;
2032} 2032}
2033 2033
2034static char g_options[256] __devinitdata = ""; 2034static char g_options[256] = "";
2035 2035
2036#ifndef MODULE 2036#ifndef MODULE
2037static int __init pxafb_setup_options(void) 2037static int __init pxafb_setup_options(void)
@@ -2061,8 +2061,7 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
2061#ifdef DEBUG_VAR 2061#ifdef DEBUG_VAR
2062/* Check for various illegal bit-combinations. Currently only 2062/* Check for various illegal bit-combinations. Currently only
2063 * a warning is given. */ 2063 * a warning is given. */
2064static void __devinit pxafb_check_options(struct device *dev, 2064static void pxafb_check_options(struct device *dev, struct pxafb_mach_info *inf)
2065 struct pxafb_mach_info *inf)
2066{ 2065{
2067 if (inf->lcd_conn) 2066 if (inf->lcd_conn)
2068 return; 2067 return;
@@ -2094,7 +2093,7 @@ static void __devinit pxafb_check_options(struct device *dev,
2094#define pxafb_check_options(...) do {} while (0) 2093#define pxafb_check_options(...) do {} while (0)
2095#endif 2094#endif
2096 2095
2097static int __devinit pxafb_probe(struct platform_device *dev) 2096static int pxafb_probe(struct platform_device *dev)
2098{ 2097{
2099 struct pxafb_info *fbi; 2098 struct pxafb_info *fbi;
2100 struct pxafb_mach_info *inf; 2099 struct pxafb_mach_info *inf;
@@ -2263,7 +2262,7 @@ failed:
2263 return ret; 2262 return ret;
2264} 2263}
2265 2264
2266static int __devexit pxafb_remove(struct platform_device *dev) 2265static int pxafb_remove(struct platform_device *dev)
2267{ 2266{
2268 struct pxafb_info *fbi = platform_get_drvdata(dev); 2267 struct pxafb_info *fbi = platform_get_drvdata(dev);
2269 struct resource *r; 2268 struct resource *r;
@@ -2304,7 +2303,7 @@ static int __devexit pxafb_remove(struct platform_device *dev)
2304 2303
2305static struct platform_driver pxafb_driver = { 2304static struct platform_driver pxafb_driver = {
2306 .probe = pxafb_probe, 2305 .probe = pxafb_probe,
2307 .remove = __devexit_p(pxafb_remove), 2306 .remove = pxafb_remove,
2308 .driver = { 2307 .driver = {
2309 .owner = THIS_MODULE, 2308 .owner = THIS_MODULE,
2310 .name = "pxa2xx-fb", 2309 .name = "pxa2xx-fb",
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index a104e8cd2f54..d44c7351de0f 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -27,7 +27,7 @@
27 27
28#define Q40_PHYS_SCREEN_ADDR 0xFE800000 28#define Q40_PHYS_SCREEN_ADDR 0xFE800000
29 29
30static struct fb_fix_screeninfo q40fb_fix __devinitdata = { 30static struct fb_fix_screeninfo q40fb_fix = {
31 .id = "Q40", 31 .id = "Q40",
32 .smem_len = 1024*1024, 32 .smem_len = 1024*1024,
33 .type = FB_TYPE_PACKED_PIXELS, 33 .type = FB_TYPE_PACKED_PIXELS,
@@ -36,7 +36,7 @@ static struct fb_fix_screeninfo q40fb_fix __devinitdata = {
36 .accel = FB_ACCEL_NONE, 36 .accel = FB_ACCEL_NONE,
37}; 37};
38 38
39static struct fb_var_screeninfo q40fb_var __devinitdata = { 39static struct fb_var_screeninfo q40fb_var = {
40 .xres = 1024, 40 .xres = 1024,
41 .yres = 512, 41 .yres = 512,
42 .xres_virtual = 1024, 42 .xres_virtual = 1024,
@@ -83,7 +83,7 @@ static struct fb_ops q40fb_ops = {
83 .fb_imageblit = cfb_imageblit, 83 .fb_imageblit = cfb_imageblit,
84}; 84};
85 85
86static int __devinit q40fb_probe(struct platform_device *dev) 86static int q40fb_probe(struct platform_device *dev)
87{ 87{
88 struct fb_info *info; 88 struct fb_info *info;
89 89
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 90df1a60bd16..9536715b5a1b 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -205,28 +205,28 @@ MODULE_DEVICE_TABLE(pci, rivafb_pci_tbl);
205 * ------------------------------------------------------------------------- */ 205 * ------------------------------------------------------------------------- */
206 206
207/* command line data, set in rivafb_setup() */ 207/* command line data, set in rivafb_setup() */
208static int flatpanel __devinitdata = -1; /* Autodetect later */ 208static int flatpanel = -1; /* Autodetect later */
209static int forceCRTC __devinitdata = -1; 209static int forceCRTC = -1;
210static bool noaccel __devinitdata = 0; 210static bool noaccel = 0;
211#ifdef CONFIG_MTRR 211#ifdef CONFIG_MTRR
212static bool nomtrr __devinitdata = 0; 212static bool nomtrr = 0;
213#endif 213#endif
214#ifdef CONFIG_PMAC_BACKLIGHT 214#ifdef CONFIG_PMAC_BACKLIGHT
215static int backlight __devinitdata = 1; 215static int backlight = 1;
216#else 216#else
217static int backlight __devinitdata = 0; 217static int backlight = 0;
218#endif 218#endif
219 219
220static char *mode_option __devinitdata = NULL; 220static char *mode_option = NULL;
221static bool strictmode = 0; 221static bool strictmode = 0;
222 222
223static struct fb_fix_screeninfo __devinitdata rivafb_fix = { 223static struct fb_fix_screeninfo rivafb_fix = {
224 .type = FB_TYPE_PACKED_PIXELS, 224 .type = FB_TYPE_PACKED_PIXELS,
225 .xpanstep = 1, 225 .xpanstep = 1,
226 .ypanstep = 1, 226 .ypanstep = 1,
227}; 227};
228 228
229static struct fb_var_screeninfo __devinitdata rivafb_default_var = { 229static struct fb_var_screeninfo rivafb_default_var = {
230 .xres = 640, 230 .xres = 640,
231 .yres = 480, 231 .yres = 480,
232 .xres_virtual = 640, 232 .xres_virtual = 640,
@@ -1709,7 +1709,7 @@ static struct fb_ops riva_fb_ops = {
1709 .fb_sync = rivafb_sync, 1709 .fb_sync = rivafb_sync,
1710}; 1710};
1711 1711
1712static int __devinit riva_set_fbinfo(struct fb_info *info) 1712static int riva_set_fbinfo(struct fb_info *info)
1713{ 1713{
1714 unsigned int cmap_len; 1714 unsigned int cmap_len;
1715 struct riva_par *par = info->par; 1715 struct riva_par *par = info->par;
@@ -1747,7 +1747,7 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
1747} 1747}
1748 1748
1749#ifdef CONFIG_PPC_OF 1749#ifdef CONFIG_PPC_OF
1750static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) 1750static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
1751{ 1751{
1752 struct riva_par *par = info->par; 1752 struct riva_par *par = info->par;
1753 struct device_node *dp; 1753 struct device_node *dp;
@@ -1780,7 +1780,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
1780#endif /* CONFIG_PPC_OF */ 1780#endif /* CONFIG_PPC_OF */
1781 1781
1782#if defined(CONFIG_FB_RIVA_I2C) && !defined(CONFIG_PPC_OF) 1782#if defined(CONFIG_FB_RIVA_I2C) && !defined(CONFIG_PPC_OF)
1783static int __devinit riva_get_EDID_i2c(struct fb_info *info) 1783static int riva_get_EDID_i2c(struct fb_info *info)
1784{ 1784{
1785 struct riva_par *par = info->par; 1785 struct riva_par *par = info->par;
1786 struct fb_var_screeninfo var; 1786 struct fb_var_screeninfo var;
@@ -1803,8 +1803,8 @@ static int __devinit riva_get_EDID_i2c(struct fb_info *info)
1803} 1803}
1804#endif /* CONFIG_FB_RIVA_I2C */ 1804#endif /* CONFIG_FB_RIVA_I2C */
1805 1805
1806static void __devinit riva_update_default_var(struct fb_var_screeninfo *var, 1806static void riva_update_default_var(struct fb_var_screeninfo *var,
1807 struct fb_info *info) 1807 struct fb_info *info)
1808{ 1808{
1809 struct fb_monspecs *specs = &info->monspecs; 1809 struct fb_monspecs *specs = &info->monspecs;
1810 struct fb_videomode modedb; 1810 struct fb_videomode modedb;
@@ -1836,7 +1836,7 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,
1836} 1836}
1837 1837
1838 1838
1839static void __devinit riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) 1839static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
1840{ 1840{
1841 NVTRACE_ENTER(); 1841 NVTRACE_ENTER();
1842#ifdef CONFIG_PPC_OF 1842#ifdef CONFIG_PPC_OF
@@ -1850,7 +1850,7 @@ static void __devinit riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
1850} 1850}
1851 1851
1852 1852
1853static void __devinit riva_get_edidinfo(struct fb_info *info) 1853static void riva_get_edidinfo(struct fb_info *info)
1854{ 1854{
1855 struct fb_var_screeninfo *var = &rivafb_default_var; 1855 struct fb_var_screeninfo *var = &rivafb_default_var;
1856 struct riva_par *par = info->par; 1856 struct riva_par *par = info->par;
@@ -1871,7 +1871,7 @@ static void __devinit riva_get_edidinfo(struct fb_info *info)
1871 * 1871 *
1872 * ------------------------------------------------------------------------- */ 1872 * ------------------------------------------------------------------------- */
1873 1873
1874static u32 __devinit riva_get_arch(struct pci_dev *pd) 1874static u32 riva_get_arch(struct pci_dev *pd)
1875{ 1875{
1876 u32 arch = 0; 1876 u32 arch = 0;
1877 1877
@@ -1909,8 +1909,7 @@ static u32 __devinit riva_get_arch(struct pci_dev *pd)
1909 return arch; 1909 return arch;
1910} 1910}
1911 1911
1912static int __devinit rivafb_probe(struct pci_dev *pd, 1912static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
1913 const struct pci_device_id *ent)
1914{ 1913{
1915 struct riva_par *default_par; 1914 struct riva_par *default_par;
1916 struct fb_info *info; 1915 struct fb_info *info;
@@ -2105,7 +2104,7 @@ err_ret:
2105 return ret; 2104 return ret;
2106} 2105}
2107 2106
2108static void __devexit rivafb_remove(struct pci_dev *pd) 2107static void rivafb_remove(struct pci_dev *pd)
2109{ 2108{
2110 struct fb_info *info = pci_get_drvdata(pd); 2109 struct fb_info *info = pci_get_drvdata(pd);
2111 struct riva_par *par = info->par; 2110 struct riva_par *par = info->par;
@@ -2145,7 +2144,7 @@ static void __devexit rivafb_remove(struct pci_dev *pd)
2145 * ------------------------------------------------------------------------- */ 2144 * ------------------------------------------------------------------------- */
2146 2145
2147#ifndef MODULE 2146#ifndef MODULE
2148static int __devinit rivafb_setup(char *options) 2147static int rivafb_setup(char *options)
2149{ 2148{
2150 char *this_opt; 2149 char *this_opt;
2151 2150
@@ -2186,7 +2185,7 @@ static struct pci_driver rivafb_driver = {
2186 .name = "rivafb", 2185 .name = "rivafb",
2187 .id_table = rivafb_pci_tbl, 2186 .id_table = rivafb_pci_tbl,
2188 .probe = rivafb_probe, 2187 .probe = rivafb_probe,
2189 .remove = __devexit_p(rivafb_remove), 2188 .remove = rivafb_remove,
2190}; 2189};
2191 2190
2192 2191
@@ -2197,7 +2196,7 @@ static struct pci_driver rivafb_driver = {
2197 * 2196 *
2198 * ------------------------------------------------------------------------- */ 2197 * ------------------------------------------------------------------------- */
2199 2198
2200static int __devinit rivafb_init(void) 2199static int rivafb_init(void)
2201{ 2200{
2202#ifndef MODULE 2201#ifndef MODULE
2203 char *option = NULL; 2202 char *option = NULL;
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 167400e2a182..6a183375ced1 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -86,9 +86,8 @@ static int riva_gpio_getsda(void* data)
86 return val; 86 return val;
87} 87}
88 88
89static int __devinit riva_setup_i2c_bus(struct riva_i2c_chan *chan, 89static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name,
90 const char *name, 90 unsigned int i2c_class)
91 unsigned int i2c_class)
92{ 91{
93 int rc; 92 int rc;
94 93
@@ -124,7 +123,7 @@ static int __devinit riva_setup_i2c_bus(struct riva_i2c_chan *chan,
124 return rc; 123 return rc;
125} 124}
126 125
127void __devinit riva_create_i2c_busses(struct riva_par *par) 126void riva_create_i2c_busses(struct riva_par *par)
128{ 127{
129 par->chan[0].par = par; 128 par->chan[0].par = par;
130 par->chan[1].par = par; 129 par->chan[1].par = par;
@@ -150,7 +149,7 @@ void riva_delete_i2c_busses(struct riva_par *par)
150 } 149 }
151} 150}
152 151
153int __devinit riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid) 152int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
154{ 153{
155 u8 *edid = NULL; 154 u8 *edid = NULL;
156 155
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 28b1c6c3d8ac..76d9053d88c1 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -84,7 +84,7 @@ static const char *s1d13xxxfb_prod_names[] = {
84/* 84/*
85 * here we define the default struct fb_fix_screeninfo 85 * here we define the default struct fb_fix_screeninfo
86 */ 86 */
87static struct fb_fix_screeninfo __devinitdata s1d13xxxfb_fix = { 87static struct fb_fix_screeninfo s1d13xxxfb_fix = {
88 .id = S1D_FBID, 88 .id = S1D_FBID,
89 .type = FB_TYPE_PACKED_PIXELS, 89 .type = FB_TYPE_PACKED_PIXELS,
90 .visual = FB_VISUAL_PSEUDOCOLOR, 90 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -622,7 +622,7 @@ static struct fb_ops s1d13xxxfb_fbops = {
622 .fb_imageblit = cfb_imageblit, 622 .fb_imageblit = cfb_imageblit,
623}; 623};
624 624
625static int s1d13xxxfb_width_tab[2][4] __devinitdata = { 625static int s1d13xxxfb_width_tab[2][4] = {
626 {4, 8, 16, -1}, 626 {4, 8, 16, -1},
627 {9, 12, 18, -1}, 627 {9, 12, 18, -1},
628}; 628};
@@ -642,8 +642,7 @@ static int s1d13xxxfb_width_tab[2][4] __devinitdata = {
642 * Note: some of the hardcoded values here might need some love to 642 * Note: some of the hardcoded values here might need some love to
643 * work on various chips, and might need to no longer be hardcoded. 643 * work on various chips, and might need to no longer be hardcoded.
644 */ 644 */
645static void __devinit 645static void s1d13xxxfb_fetch_hw_state(struct fb_info *info)
646s1d13xxxfb_fetch_hw_state(struct fb_info *info)
647{ 646{
648 struct fb_var_screeninfo *var = &info->var; 647 struct fb_var_screeninfo *var = &info->var;
649 struct fb_fix_screeninfo *fix = &info->fix; 648 struct fb_fix_screeninfo *fix = &info->fix;
@@ -764,8 +763,7 @@ s1d13xxxfb_remove(struct platform_device *pdev)
764 return 0; 763 return 0;
765} 764}
766 765
767static int __devinit 766static int s1d13xxxfb_probe(struct platform_device *pdev)
768s1d13xxxfb_probe(struct platform_device *pdev)
769{ 767{
770 struct s1d13xxxfb_par *default_par; 768 struct s1d13xxxfb_par *default_par;
771 struct fb_info *info; 769 struct fb_info *info;
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 1a00ad241edd..9b57a235c9bc 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1081,8 +1081,7 @@ static void s3c_fb_missing_pixclock(struct fb_videomode *mode)
1081 * 1081 *
1082 * Allocate memory for the given framebuffer. 1082 * Allocate memory for the given framebuffer.
1083 */ 1083 */
1084static int __devinit s3c_fb_alloc_memory(struct s3c_fb *sfb, 1084static int s3c_fb_alloc_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
1085 struct s3c_fb_win *win)
1086{ 1085{
1087 struct s3c_fb_pd_win *windata = win->windata; 1086 struct s3c_fb_pd_win *windata = win->windata;
1088 unsigned int real_size, virt_size, size; 1087 unsigned int real_size, virt_size, size;
@@ -1172,9 +1171,9 @@ static void s3c_fb_release_win(struct s3c_fb *sfb, struct s3c_fb_win *win)
1172 * Allocate and do the basic initialisation for one of the hardware's graphics 1171 * Allocate and do the basic initialisation for one of the hardware's graphics
1173 * windows. 1172 * windows.
1174 */ 1173 */
1175static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no, 1174static int s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
1176 struct s3c_fb_win_variant *variant, 1175 struct s3c_fb_win_variant *variant,
1177 struct s3c_fb_win **res) 1176 struct s3c_fb_win **res)
1178{ 1177{
1179 struct fb_var_screeninfo *var; 1178 struct fb_var_screeninfo *var;
1180 struct fb_videomode initmode; 1179 struct fb_videomode initmode;
@@ -1360,7 +1359,7 @@ static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
1360 } 1359 }
1361} 1360}
1362 1361
1363static int __devinit s3c_fb_probe(struct platform_device *pdev) 1362static int s3c_fb_probe(struct platform_device *pdev)
1364{ 1363{
1365 const struct platform_device_id *platid; 1364 const struct platform_device_id *platid;
1366 struct s3c_fb_driverdata *fbdrv; 1365 struct s3c_fb_driverdata *fbdrv;
@@ -1521,7 +1520,7 @@ err_bus_clk:
1521 * Shutdown and then release all the resources that the driver allocated 1520 * Shutdown and then release all the resources that the driver allocated
1522 * on initialisation. 1521 * on initialisation.
1523 */ 1522 */
1524static int __devexit s3c_fb_remove(struct platform_device *pdev) 1523static int s3c_fb_remove(struct platform_device *pdev)
1525{ 1524{
1526 struct s3c_fb *sfb = platform_get_drvdata(pdev); 1525 struct s3c_fb *sfb = platform_get_drvdata(pdev);
1527 int win; 1526 int win;
@@ -2035,7 +2034,7 @@ static const struct dev_pm_ops s3cfb_pm_ops = {
2035 2034
2036static struct platform_driver s3c_fb_driver = { 2035static struct platform_driver s3c_fb_driver = {
2037 .probe = s3c_fb_probe, 2036 .probe = s3c_fb_probe,
2038 .remove = __devexit_p(s3c_fb_remove), 2037 .remove = s3c_fb_remove,
2039 .id_table = s3c_fb_driver_ids, 2038 .id_table = s3c_fb_driver_ids,
2040 .driver = { 2039 .driver = {
2041 .name = "s3c-fb", 2040 .name = "s3c-fb",
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 1083bb9469ee..76a0e7fbd692 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -637,7 +637,7 @@ static struct fb_ops s3c2410fb_ops = {
637 * cache. Once this area is remapped, all virtual memory 637 * cache. Once this area is remapped, all virtual memory
638 * access to the video memory should occur at the new region. 638 * access to the video memory should occur at the new region.
639 */ 639 */
640static int __devinit s3c2410fb_map_video_memory(struct fb_info *info) 640static int s3c2410fb_map_video_memory(struct fb_info *info)
641{ 641{
642 struct s3c2410fb_info *fbi = info->par; 642 struct s3c2410fb_info *fbi = info->par;
643 dma_addr_t map_dma; 643 dma_addr_t map_dma;
@@ -819,8 +819,8 @@ static inline void s3c2410fb_cpufreq_deregister(struct s3c2410fb_info *info)
819 819
820static const char driver_name[] = "s3c2410fb"; 820static const char driver_name[] = "s3c2410fb";
821 821
822static int __devinit s3c24xxfb_probe(struct platform_device *pdev, 822static int s3c24xxfb_probe(struct platform_device *pdev,
823 enum s3c_drv_type drv_type) 823 enum s3c_drv_type drv_type)
824{ 824{
825 struct s3c2410fb_info *info; 825 struct s3c2410fb_info *info;
826 struct s3c2410fb_display *display; 826 struct s3c2410fb_display *display;
@@ -1010,12 +1010,12 @@ dealloc_fb:
1010 return ret; 1010 return ret;
1011} 1011}
1012 1012
1013static int __devinit s3c2410fb_probe(struct platform_device *pdev) 1013static int s3c2410fb_probe(struct platform_device *pdev)
1014{ 1014{
1015 return s3c24xxfb_probe(pdev, DRV_S3C2410); 1015 return s3c24xxfb_probe(pdev, DRV_S3C2410);
1016} 1016}
1017 1017
1018static int __devinit s3c2412fb_probe(struct platform_device *pdev) 1018static int s3c2412fb_probe(struct platform_device *pdev)
1019{ 1019{
1020 return s3c24xxfb_probe(pdev, DRV_S3C2412); 1020 return s3c24xxfb_probe(pdev, DRV_S3C2412);
1021} 1021}
@@ -1024,7 +1024,7 @@ static int __devinit s3c2412fb_probe(struct platform_device *pdev)
1024/* 1024/*
1025 * Cleanup 1025 * Cleanup
1026 */ 1026 */
1027static int __devexit s3c2410fb_remove(struct platform_device *pdev) 1027static int s3c2410fb_remove(struct platform_device *pdev)
1028{ 1028{
1029 struct fb_info *fbinfo = platform_get_drvdata(pdev); 1029 struct fb_info *fbinfo = platform_get_drvdata(pdev);
1030 struct s3c2410fb_info *info = fbinfo->par; 1030 struct s3c2410fb_info *info = fbinfo->par;
@@ -1101,7 +1101,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
1101 1101
1102static struct platform_driver s3c2410fb_driver = { 1102static struct platform_driver s3c2410fb_driver = {
1103 .probe = s3c2410fb_probe, 1103 .probe = s3c2410fb_probe,
1104 .remove = __devexit_p(s3c2410fb_remove), 1104 .remove = s3c2410fb_remove,
1105 .suspend = s3c2410fb_suspend, 1105 .suspend = s3c2410fb_suspend,
1106 .resume = s3c2410fb_resume, 1106 .resume = s3c2410fb_resume,
1107 .driver = { 1107 .driver = {
@@ -1112,7 +1112,7 @@ static struct platform_driver s3c2410fb_driver = {
1112 1112
1113static struct platform_driver s3c2412fb_driver = { 1113static struct platform_driver s3c2412fb_driver = {
1114 .probe = s3c2412fb_probe, 1114 .probe = s3c2412fb_probe,
1115 .remove = __devexit_p(s3c2410fb_remove), 1115 .remove = s3c2410fb_remove,
1116 .suspend = s3c2410fb_suspend, 1116 .suspend = s3c2410fb_suspend,
1117 .resume = s3c2410fb_resume, 1117 .resume = s3c2410fb_resume,
1118 .driver = { 1118 .driver = {
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 1d007366b917..47ca86c5c6c0 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -153,10 +153,10 @@ static const struct svga_timing_regs s3_timing_regs = {
153/* Module parameters */ 153/* Module parameters */
154 154
155 155
156static char *mode_option __devinitdata; 156static char *mode_option;
157 157
158#ifdef CONFIG_MTRR 158#ifdef CONFIG_MTRR
159static int mtrr __devinitdata = 1; 159static int mtrr = 1;
160#endif 160#endif
161 161
162static int fasttext = 1; 162static int fasttext = 1;
@@ -255,7 +255,7 @@ static int s3fb_ddc_getsda(void *data)
255 return !!(s3fb_ddc_read(par) & DDC_SDA_IN); 255 return !!(s3fb_ddc_read(par) & DDC_SDA_IN);
256} 256}
257 257
258static int __devinit s3fb_setup_ddc_bus(struct fb_info *info) 258static int s3fb_setup_ddc_bus(struct fb_info *info)
259{ 259{
260 struct s3fb_info *par = info->par; 260 struct s3fb_info *par = info->par;
261 261
@@ -1066,7 +1066,7 @@ static struct fb_ops s3fb_ops = {
1066 1066
1067/* ------------------------------------------------------------------------- */ 1067/* ------------------------------------------------------------------------- */
1068 1068
1069static int __devinit s3_identification(struct s3fb_info *par) 1069static int s3_identification(struct s3fb_info *par)
1070{ 1070{
1071 int chip = par->chip; 1071 int chip = par->chip;
1072 1072
@@ -1122,7 +1122,7 @@ static int __devinit s3_identification(struct s3fb_info *par)
1122 1122
1123/* PCI probe */ 1123/* PCI probe */
1124 1124
1125static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 1125static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
1126{ 1126{
1127 struct pci_bus_region bus_reg; 1127 struct pci_bus_region bus_reg;
1128 struct resource vga_res; 1128 struct resource vga_res;
@@ -1403,7 +1403,7 @@ err_enable_device:
1403 1403
1404/* PCI remove */ 1404/* PCI remove */
1405 1405
1406static void __devexit s3_pci_remove(struct pci_dev *dev) 1406static void s3_pci_remove(struct pci_dev *dev)
1407{ 1407{
1408 struct fb_info *info = pci_get_drvdata(dev); 1408 struct fb_info *info = pci_get_drvdata(dev);
1409 struct s3fb_info __maybe_unused *par = info->par; 1409 struct s3fb_info __maybe_unused *par = info->par;
@@ -1509,7 +1509,7 @@ static int s3_pci_resume(struct pci_dev* dev)
1509 1509
1510/* List of boards that we are trying to support */ 1510/* List of boards that we are trying to support */
1511 1511
1512static struct pci_device_id s3_devices[] __devinitdata = { 1512static struct pci_device_id s3_devices[] = {
1513 {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8810), .driver_data = CHIP_XXX_TRIO}, 1513 {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8810), .driver_data = CHIP_XXX_TRIO},
1514 {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8811), .driver_data = CHIP_XXX_TRIO}, 1514 {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8811), .driver_data = CHIP_XXX_TRIO},
1515 {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8812), .driver_data = CHIP_M65_AURORA64VP}, 1515 {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8812), .driver_data = CHIP_M65_AURORA64VP},
@@ -1537,7 +1537,7 @@ static struct pci_driver s3fb_pci_driver = {
1537 .name = "s3fb", 1537 .name = "s3fb",
1538 .id_table = s3_devices, 1538 .id_table = s3_devices,
1539 .probe = s3_pci_probe, 1539 .probe = s3_pci_probe,
1540 .remove = __devexit_p(s3_pci_remove), 1540 .remove = s3_pci_remove,
1541 .suspend = s3_pci_suspend, 1541 .suspend = s3_pci_suspend,
1542 .resume = s3_pci_resume, 1542 .resume = s3_pci_resume,
1543}; 1543};
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index b6325848ad61..cfbde5e85cbf 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1090,7 +1090,7 @@ static int sa1100fb_resume(struct platform_device *dev)
1090 * cache. Once this area is remapped, all virtual memory 1090 * cache. Once this area is remapped, all virtual memory
1091 * access to the video memory should occur at the new region. 1091 * access to the video memory should occur at the new region.
1092 */ 1092 */
1093static int __devinit sa1100fb_map_video_memory(struct sa1100fb_info *fbi) 1093static int sa1100fb_map_video_memory(struct sa1100fb_info *fbi)
1094{ 1094{
1095 /* 1095 /*
1096 * We reserve one page for the palette, plus the size 1096 * We reserve one page for the palette, plus the size
@@ -1116,7 +1116,7 @@ static int __devinit sa1100fb_map_video_memory(struct sa1100fb_info *fbi)
1116} 1116}
1117 1117
1118/* Fake monspecs to fill in fbinfo structure */ 1118/* Fake monspecs to fill in fbinfo structure */
1119static struct fb_monspecs monspecs __devinitdata = { 1119static struct fb_monspecs monspecs = {
1120 .hfmin = 30000, 1120 .hfmin = 30000,
1121 .hfmax = 70000, 1121 .hfmax = 70000,
1122 .vfmin = 50, 1122 .vfmin = 50,
@@ -1124,7 +1124,7 @@ static struct fb_monspecs monspecs __devinitdata = {
1124}; 1124};
1125 1125
1126 1126
1127static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev) 1127static struct sa1100fb_info *sa1100fb_init_fbinfo(struct device *dev)
1128{ 1128{
1129 struct sa1100fb_mach_info *inf = dev->platform_data; 1129 struct sa1100fb_mach_info *inf = dev->platform_data;
1130 struct sa1100fb_info *fbi; 1130 struct sa1100fb_info *fbi;
@@ -1205,7 +1205,7 @@ static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev)
1205 return fbi; 1205 return fbi;
1206} 1206}
1207 1207
1208static int __devinit sa1100fb_probe(struct platform_device *pdev) 1208static int sa1100fb_probe(struct platform_device *pdev)
1209{ 1209{
1210 struct sa1100fb_info *fbi; 1210 struct sa1100fb_info *fbi;
1211 struct resource *res; 1211 struct resource *res;
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index f4f53b082d05..741b2395d01e 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -69,7 +69,7 @@
69/* --------------------------------------------------------------------- */ 69/* --------------------------------------------------------------------- */
70 70
71 71
72static char *mode_option __devinitdata = NULL; 72static char *mode_option = NULL;
73 73
74#ifdef MODULE 74#ifdef MODULE
75 75
@@ -1664,7 +1664,7 @@ static struct fb_ops savagefb_ops = {
1664 1664
1665/* --------------------------------------------------------------------- */ 1665/* --------------------------------------------------------------------- */
1666 1666
1667static struct fb_var_screeninfo __devinitdata savagefb_var800x600x8 = { 1667static struct fb_var_screeninfo savagefb_var800x600x8 = {
1668 .accel_flags = FB_ACCELF_TEXT, 1668 .accel_flags = FB_ACCELF_TEXT,
1669 .xres = 800, 1669 .xres = 800,
1670 .yres = 600, 1670 .yres = 600,
@@ -1715,7 +1715,7 @@ static void savage_disable_mmio(struct savagefb_par *par)
1715} 1715}
1716 1716
1717 1717
1718static int __devinit savage_map_mmio(struct fb_info *info) 1718static int savage_map_mmio(struct fb_info *info)
1719{ 1719{
1720 struct savagefb_par *par = info->par; 1720 struct savagefb_par *par = info->par;
1721 DBG("savage_map_mmio"); 1721 DBG("savage_map_mmio");
@@ -1761,8 +1761,7 @@ static void savage_unmap_mmio(struct fb_info *info)
1761 } 1761 }
1762} 1762}
1763 1763
1764static int __devinit savage_map_video(struct fb_info *info, 1764static int savage_map_video(struct fb_info *info, int video_len)
1765 int video_len)
1766{ 1765{
1767 struct savagefb_par *par = info->par; 1766 struct savagefb_par *par = info->par;
1768 int resource; 1767 int resource;
@@ -2052,9 +2051,8 @@ static int savage_init_hw(struct savagefb_par *par)
2052 return videoRambytes; 2051 return videoRambytes;
2053} 2052}
2054 2053
2055static int __devinit savage_init_fb_info(struct fb_info *info, 2054static int savage_init_fb_info(struct fb_info *info, struct pci_dev *dev,
2056 struct pci_dev *dev, 2055 const struct pci_device_id *id)
2057 const struct pci_device_id *id)
2058{ 2056{
2059 struct savagefb_par *par = info->par; 2057 struct savagefb_par *par = info->par;
2060 int err = 0; 2058 int err = 0;
@@ -2178,8 +2176,7 @@ static int __devinit savage_init_fb_info(struct fb_info *info,
2178 2176
2179/* --------------------------------------------------------------------- */ 2177/* --------------------------------------------------------------------- */
2180 2178
2181static int __devinit savagefb_probe(struct pci_dev* dev, 2179static int savagefb_probe(struct pci_dev *dev, const struct pci_device_id *id)
2182 const struct pci_device_id* id)
2183{ 2180{
2184 struct fb_info *info; 2181 struct fb_info *info;
2185 struct savagefb_par *par; 2182 struct savagefb_par *par;
@@ -2340,7 +2337,7 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
2340 return err; 2337 return err;
2341} 2338}
2342 2339
2343static void __devexit savagefb_remove(struct pci_dev *dev) 2340static void savagefb_remove(struct pci_dev *dev)
2344{ 2341{
2345 struct fb_info *info = pci_get_drvdata(dev); 2342 struct fb_info *info = pci_get_drvdata(dev);
2346 2343
@@ -2449,7 +2446,7 @@ static int savagefb_resume(struct pci_dev* dev)
2449} 2446}
2450 2447
2451 2448
2452static struct pci_device_id savagefb_devices[] __devinitdata = { 2449static struct pci_device_id savagefb_devices[] = {
2453 {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX128, 2450 {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX128,
2454 PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE}, 2451 PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
2455 2452
@@ -2530,7 +2527,7 @@ static struct pci_driver savagefb_driver = {
2530 .probe = savagefb_probe, 2527 .probe = savagefb_probe,
2531 .suspend = savagefb_suspend, 2528 .suspend = savagefb_suspend,
2532 .resume = savagefb_resume, 2529 .resume = savagefb_resume,
2533 .remove = __devexit_p(savagefb_remove) 2530 .remove = savagefb_remove,
2534}; 2531};
2535 2532
2536/* **************************** exit-time only **************************** */ 2533/* **************************** exit-time only **************************** */
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 53455f295510..2331fadc272b 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -47,7 +47,7 @@ static int ywrap = 0;
47 47
48static int flatpanel_id = -1; 48static int flatpanel_id = -1;
49 49
50static struct fb_fix_screeninfo sgivwfb_fix __devinitdata = { 50static struct fb_fix_screeninfo sgivwfb_fix = {
51 .id = "SGI Vis WS FB", 51 .id = "SGI Vis WS FB",
52 .type = FB_TYPE_PACKED_PIXELS, 52 .type = FB_TYPE_PACKED_PIXELS,
53 .visual = FB_VISUAL_PSEUDOCOLOR, 53 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -57,7 +57,7 @@ static struct fb_fix_screeninfo sgivwfb_fix __devinitdata = {
57 .line_length = 640, 57 .line_length = 640,
58}; 58};
59 59
60static struct fb_var_screeninfo sgivwfb_var __devinitdata = { 60static struct fb_var_screeninfo sgivwfb_var = {
61 /* 640x480, 8 bpp */ 61 /* 640x480, 8 bpp */
62 .xres = 640, 62 .xres = 640,
63 .yres = 480, 63 .yres = 480,
@@ -79,7 +79,7 @@ static struct fb_var_screeninfo sgivwfb_var __devinitdata = {
79 .vmode = FB_VMODE_NONINTERLACED 79 .vmode = FB_VMODE_NONINTERLACED
80}; 80};
81 81
82static struct fb_var_screeninfo sgivwfb_var1600sw __devinitdata = { 82static struct fb_var_screeninfo sgivwfb_var1600sw = {
83 /* 1600x1024, 8 bpp */ 83 /* 1600x1024, 8 bpp */
84 .xres = 1600, 84 .xres = 1600,
85 .yres = 1024, 85 .yres = 1024,
@@ -745,7 +745,7 @@ int __init sgivwfb_setup(char *options)
745/* 745/*
746 * Initialisation 746 * Initialisation
747 */ 747 */
748static int __devinit sgivwfb_probe(struct platform_device *dev) 748static int sgivwfb_probe(struct platform_device *dev)
749{ 749{
750 struct sgivw_par *par; 750 struct sgivw_par *par;
751 struct fb_info *info; 751 struct fb_info *info;
@@ -825,7 +825,7 @@ fail_ioremap_regs:
825 return -ENXIO; 825 return -ENXIO;
826} 826}
827 827
828static int __devexit sgivwfb_remove(struct platform_device *dev) 828static int sgivwfb_remove(struct platform_device *dev)
829{ 829{
830 struct fb_info *info = platform_get_drvdata(dev); 830 struct fb_info *info = platform_get_drvdata(dev);
831 831
@@ -845,7 +845,7 @@ static int __devexit sgivwfb_remove(struct platform_device *dev)
845 845
846static struct platform_driver sgivwfb_driver = { 846static struct platform_driver sgivwfb_driver = {
847 .probe = sgivwfb_probe, 847 .probe = sgivwfb_probe,
848 .remove = __devexit_p(sgivwfb_remove), 848 .remove = sgivwfb_remove,
849 .driver = { 849 .driver = {
850 .name = "sgivwfb", 850 .name = "sgivwfb",
851 }, 851 },
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index 83b16e237a0e..5fbb0c7ab0c8 100644
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -431,7 +431,7 @@ static int sh7760fb_alloc_mem(struct fb_info *info)
431 return 0; 431 return 0;
432} 432}
433 433
434static int __devinit sh7760fb_probe(struct platform_device *pdev) 434static int sh7760fb_probe(struct platform_device *pdev)
435{ 435{
436 struct fb_info *info; 436 struct fb_info *info;
437 struct resource *res; 437 struct resource *res;
@@ -557,7 +557,7 @@ out_fb:
557 return ret; 557 return ret;
558} 558}
559 559
560static int __devexit sh7760fb_remove(struct platform_device *dev) 560static int sh7760fb_remove(struct platform_device *dev)
561{ 561{
562 struct fb_info *info = platform_get_drvdata(dev); 562 struct fb_info *info = platform_get_drvdata(dev);
563 struct sh7760fb_par *par = info->par; 563 struct sh7760fb_par *par = info->par;
@@ -582,7 +582,7 @@ static struct platform_driver sh7760_lcdc_driver = {
582 .owner = THIS_MODULE, 582 .owner = THIS_MODULE,
583 }, 583 },
584 .probe = sh7760fb_probe, 584 .probe = sh7760fb_probe,
585 .remove = __devexit_p(sh7760fb_remove), 585 .remove = sh7760fb_remove,
586}; 586};
587 587
588module_platform_driver(sh7760_lcdc_driver); 588module_platform_driver(sh7760_lcdc_driver);
diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index f4962292792c..701b461cf8a9 100644
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -533,7 +533,7 @@ efindslot:
533 return ret; 533 return ret;
534} 534}
535 535
536static int __devexit sh_mipi_remove(struct platform_device *pdev) 536static int sh_mipi_remove(struct platform_device *pdev)
537{ 537{
538 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 538 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
539 struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1); 539 struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@@ -574,7 +574,7 @@ static int __devexit sh_mipi_remove(struct platform_device *pdev)
574} 574}
575 575
576static struct platform_driver sh_mipi_driver = { 576static struct platform_driver sh_mipi_driver = {
577 .remove = __devexit_p(sh_mipi_remove), 577 .remove = sh_mipi_remove,
578 .shutdown = sh_mipi_shutdown, 578 .shutdown = sh_mipi_shutdown,
579 .driver = { 579 .driver = {
580 .name = "sh-mipi-dsi", 580 .name = "sh-mipi-dsi",
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index e78fe4bc1524..63203acef812 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -1649,7 +1649,7 @@ sh_mobile_lcdc_overlay_fb_unregister(struct sh_mobile_lcdc_overlay *ovl)
1649 unregister_framebuffer(ovl->info); 1649 unregister_framebuffer(ovl->info);
1650} 1650}
1651 1651
1652static int __devinit 1652static int
1653sh_mobile_lcdc_overlay_fb_register(struct sh_mobile_lcdc_overlay *ovl) 1653sh_mobile_lcdc_overlay_fb_register(struct sh_mobile_lcdc_overlay *ovl)
1654{ 1654{
1655 struct sh_mobile_lcdc_priv *lcdc = ovl->channel->lcdc; 1655 struct sh_mobile_lcdc_priv *lcdc = ovl->channel->lcdc;
@@ -1688,7 +1688,7 @@ sh_mobile_lcdc_overlay_fb_cleanup(struct sh_mobile_lcdc_overlay *ovl)
1688 framebuffer_release(info); 1688 framebuffer_release(info);
1689} 1689}
1690 1690
1691static int __devinit 1691static int
1692sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl) 1692sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl)
1693{ 1693{
1694 struct sh_mobile_lcdc_priv *priv = ovl->channel->lcdc; 1694 struct sh_mobile_lcdc_priv *priv = ovl->channel->lcdc;
@@ -2137,7 +2137,7 @@ sh_mobile_lcdc_channel_fb_unregister(struct sh_mobile_lcdc_chan *ch)
2137 unregister_framebuffer(ch->info); 2137 unregister_framebuffer(ch->info);
2138} 2138}
2139 2139
2140static int __devinit 2140static int
2141sh_mobile_lcdc_channel_fb_register(struct sh_mobile_lcdc_chan *ch) 2141sh_mobile_lcdc_channel_fb_register(struct sh_mobile_lcdc_chan *ch)
2142{ 2142{
2143 struct fb_info *info = ch->info; 2143 struct fb_info *info = ch->info;
@@ -2185,7 +2185,7 @@ sh_mobile_lcdc_channel_fb_cleanup(struct sh_mobile_lcdc_chan *ch)
2185 framebuffer_release(info); 2185 framebuffer_release(info);
2186} 2186}
2187 2187
2188static int __devinit 2188static int
2189sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch, 2189sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch,
2190 const struct fb_videomode *modes, 2190 const struct fb_videomode *modes,
2191 unsigned int num_modes) 2191 unsigned int num_modes)
@@ -2417,7 +2417,7 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb,
2417 * Probe/remove and driver init/exit 2417 * Probe/remove and driver init/exit
2418 */ 2418 */
2419 2419
2420static const struct fb_videomode default_720p __devinitconst = { 2420static const struct fb_videomode default_720p = {
2421 .name = "HDMI 720p", 2421 .name = "HDMI 720p",
2422 .xres = 1280, 2422 .xres = 1280,
2423 .yres = 720, 2423 .yres = 720,
@@ -2496,7 +2496,7 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
2496 return 0; 2496 return 0;
2497} 2497}
2498 2498
2499static int __devinit sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch) 2499static int sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch)
2500{ 2500{
2501 int interface_type = ch->cfg->interface_type; 2501 int interface_type = ch->cfg->interface_type;
2502 2502
@@ -2536,7 +2536,7 @@ static int __devinit sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *
2536 return 0; 2536 return 0;
2537} 2537}
2538 2538
2539static int __devinit 2539static int
2540sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_overlay *ovl) 2540sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_overlay *ovl)
2541{ 2541{
2542 const struct sh_mobile_lcdc_format_info *format; 2542 const struct sh_mobile_lcdc_format_info *format;
@@ -2591,7 +2591,7 @@ sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_overlay *ovl)
2591 return 0; 2591 return 0;
2592} 2592}
2593 2593
2594static int __devinit 2594static int
2595sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch) 2595sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch)
2596{ 2596{
2597 const struct sh_mobile_lcdc_format_info *format; 2597 const struct sh_mobile_lcdc_format_info *format;
@@ -2695,7 +2695,7 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch)
2695 return sh_mobile_lcdc_channel_fb_init(ch, mode, num_modes); 2695 return sh_mobile_lcdc_channel_fb_init(ch, mode, num_modes);
2696} 2696}
2697 2697
2698static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 2698static int sh_mobile_lcdc_probe(struct platform_device *pdev)
2699{ 2699{
2700 struct sh_mobile_lcdc_info *pdata = pdev->dev.platform_data; 2700 struct sh_mobile_lcdc_info *pdata = pdev->dev.platform_data;
2701 struct sh_mobile_lcdc_priv *priv; 2701 struct sh_mobile_lcdc_priv *priv;
diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index 7a0ba8bb3fbe..e0f098562a74 100644
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -620,7 +620,7 @@ static UNIVERSAL_DEV_PM_OPS(sh_mobile_meram_dev_pm_ops,
620 * Probe/remove and driver init/exit 620 * Probe/remove and driver init/exit
621 */ 621 */
622 622
623static int __devinit sh_mobile_meram_probe(struct platform_device *pdev) 623static int sh_mobile_meram_probe(struct platform_device *pdev)
624{ 624{
625 struct sh_mobile_meram_priv *priv; 625 struct sh_mobile_meram_priv *priv;
626 struct sh_mobile_meram_info *pdata = pdev->dev.platform_data; 626 struct sh_mobile_meram_info *pdata = pdev->dev.platform_data;
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index a7a48db64ce2..977e27927a21 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -106,8 +106,7 @@ sisfb_setdefaultparms(void)
106 106
107/* ------------- Parameter parsing -------------- */ 107/* ------------- Parameter parsing -------------- */
108 108
109static void __devinit 109static void sisfb_search_vesamode(unsigned int vesamode, bool quiet)
110sisfb_search_vesamode(unsigned int vesamode, bool quiet)
111{ 110{
112 int i = 0, j = 0; 111 int i = 0, j = 0;
113 112
@@ -146,8 +145,7 @@ sisfb_search_vesamode(unsigned int vesamode, bool quiet)
146 printk(KERN_ERR "sisfb: Invalid VESA mode 0x%x'\n", vesamode); 145 printk(KERN_ERR "sisfb: Invalid VESA mode 0x%x'\n", vesamode);
147} 146}
148 147
149static void __devinit 148static void sisfb_search_mode(char *name, bool quiet)
150sisfb_search_mode(char *name, bool quiet)
151{ 149{
152 unsigned int j = 0, xres = 0, yres = 0, depth = 0, rate = 0; 150 unsigned int j = 0, xres = 0, yres = 0, depth = 0, rate = 0;
153 int i = 0; 151 int i = 0;
@@ -225,8 +223,7 @@ sisfb_search_mode(char *name, bool quiet)
225} 223}
226 224
227#ifndef MODULE 225#ifndef MODULE
228static void __devinit 226static void sisfb_get_vga_mode_from_kernel(void)
229sisfb_get_vga_mode_from_kernel(void)
230{ 227{
231#ifdef CONFIG_X86 228#ifdef CONFIG_X86
232 char mymode[32]; 229 char mymode[32];
@@ -345,8 +342,7 @@ sisfb_search_specialtiming(const char *name)
345 342
346/* ----------- Various detection routines ----------- */ 343/* ----------- Various detection routines ----------- */
347 344
348static void __devinit 345static void sisfb_detect_custom_timing(struct sis_video_info *ivideo)
349sisfb_detect_custom_timing(struct sis_video_info *ivideo)
350{ 346{
351 unsigned char *biosver = NULL; 347 unsigned char *biosver = NULL;
352 unsigned char *biosdate = NULL; 348 unsigned char *biosdate = NULL;
@@ -403,8 +399,7 @@ sisfb_detect_custom_timing(struct sis_video_info *ivideo)
403 } while(mycustomttable[i].chipID); 399 } while(mycustomttable[i].chipID);
404} 400}
405 401
406static bool __devinit 402static bool sisfb_interpret_edid(struct sisfb_monitor *monitor, u8 *buffer)
407sisfb_interpret_edid(struct sisfb_monitor *monitor, u8 *buffer)
408{ 403{
409 int i, j, xres, yres, refresh, index; 404 int i, j, xres, yres, refresh, index;
410 u32 emodes; 405 u32 emodes;
@@ -505,8 +500,8 @@ sisfb_interpret_edid(struct sisfb_monitor *monitor, u8 *buffer)
505 return monitor->datavalid; 500 return monitor->datavalid;
506} 501}
507 502
508static void __devinit 503static void sisfb_handle_ddc(struct sis_video_info *ivideo,
509sisfb_handle_ddc(struct sis_video_info *ivideo, struct sisfb_monitor *monitor, int crtno) 504 struct sisfb_monitor *monitor, int crtno)
510{ 505{
511 unsigned short temp, i, realcrtno = crtno; 506 unsigned short temp, i, realcrtno = crtno;
512 unsigned char buffer[256]; 507 unsigned char buffer[256];
@@ -1898,8 +1893,7 @@ static struct fb_ops sisfb_ops = {
1898 1893
1899/* ---------------- Chip generation dependent routines ---------------- */ 1894/* ---------------- Chip generation dependent routines ---------------- */
1900 1895
1901static struct pci_dev * __devinit 1896static struct pci_dev *sisfb_get_northbridge(int basechipid)
1902sisfb_get_northbridge(int basechipid)
1903{ 1897{
1904 struct pci_dev *pdev = NULL; 1898 struct pci_dev *pdev = NULL;
1905 int nbridgenum, nbridgeidx, i; 1899 int nbridgenum, nbridgeidx, i;
@@ -1938,8 +1932,7 @@ sisfb_get_northbridge(int basechipid)
1938 return pdev; 1932 return pdev;
1939} 1933}
1940 1934
1941static int __devinit 1935static int sisfb_get_dram_size(struct sis_video_info *ivideo)
1942sisfb_get_dram_size(struct sis_video_info *ivideo)
1943{ 1936{
1944#if defined(CONFIG_FB_SIS_300) || defined(CONFIG_FB_SIS_315) 1937#if defined(CONFIG_FB_SIS_300) || defined(CONFIG_FB_SIS_315)
1945 u8 reg; 1938 u8 reg;
@@ -2038,8 +2031,7 @@ sisfb_get_dram_size(struct sis_video_info *ivideo)
2038 2031
2039/* -------------- video bridge device detection --------------- */ 2032/* -------------- video bridge device detection --------------- */
2040 2033
2041static void __devinit 2034static void sisfb_detect_VB_connect(struct sis_video_info *ivideo)
2042sisfb_detect_VB_connect(struct sis_video_info *ivideo)
2043{ 2035{
2044 u8 cr32, temp; 2036 u8 cr32, temp;
2045 2037
@@ -2164,8 +2156,7 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)
2164 2156
2165/* ------------------ Sensing routines ------------------ */ 2157/* ------------------ Sensing routines ------------------ */
2166 2158
2167static bool __devinit 2159static bool sisfb_test_DDC1(struct sis_video_info *ivideo)
2168sisfb_test_DDC1(struct sis_video_info *ivideo)
2169{ 2160{
2170 unsigned short old; 2161 unsigned short old;
2171 int count = 48; 2162 int count = 48;
@@ -2177,8 +2168,7 @@ sisfb_test_DDC1(struct sis_video_info *ivideo)
2177 return (count != -1); 2168 return (count != -1);
2178} 2169}
2179 2170
2180static void __devinit 2171static void sisfb_sense_crt1(struct sis_video_info *ivideo)
2181sisfb_sense_crt1(struct sis_video_info *ivideo)
2182{ 2172{
2183 bool mustwait = false; 2173 bool mustwait = false;
2184 u8 sr1F, cr17; 2174 u8 sr1F, cr17;
@@ -2259,8 +2249,7 @@ sisfb_sense_crt1(struct sis_video_info *ivideo)
2259} 2249}
2260 2250
2261/* Determine and detect attached devices on SiS30x */ 2251/* Determine and detect attached devices on SiS30x */
2262static void __devinit 2252static void SiS_SenseLCD(struct sis_video_info *ivideo)
2263SiS_SenseLCD(struct sis_video_info *ivideo)
2264{ 2253{
2265 unsigned char buffer[256]; 2254 unsigned char buffer[256];
2266 unsigned short temp, realcrtno, i; 2255 unsigned short temp, realcrtno, i;
@@ -2347,8 +2336,7 @@ SiS_SenseLCD(struct sis_video_info *ivideo)
2347 ivideo->SiS_Pr.PanelSelfDetected = true; 2336 ivideo->SiS_Pr.PanelSelfDetected = true;
2348} 2337}
2349 2338
2350static int __devinit 2339static int SISDoSense(struct sis_video_info *ivideo, u16 type, u16 test)
2351SISDoSense(struct sis_video_info *ivideo, u16 type, u16 test)
2352{ 2340{
2353 int temp, mytest, result, i, j; 2341 int temp, mytest, result, i, j;
2354 2342
@@ -2377,8 +2365,7 @@ SISDoSense(struct sis_video_info *ivideo, u16 type, u16 test)
2377 return result; 2365 return result;
2378} 2366}
2379 2367
2380static void __devinit 2368static void SiS_Sense30x(struct sis_video_info *ivideo)
2381SiS_Sense30x(struct sis_video_info *ivideo)
2382{ 2369{
2383 u8 backupP4_0d,backupP2_00,backupP2_4d,backupSR_1e,biosflag=0; 2370 u8 backupP4_0d,backupP2_00,backupP2_4d,backupSR_1e,biosflag=0;
2384 u16 svhs=0, svhs_c=0; 2371 u16 svhs=0, svhs_c=0;
@@ -2518,8 +2505,7 @@ SiS_Sense30x(struct sis_video_info *ivideo)
2518} 2505}
2519 2506
2520/* Determine and detect attached TV's on Chrontel */ 2507/* Determine and detect attached TV's on Chrontel */
2521static void __devinit 2508static void SiS_SenseCh(struct sis_video_info *ivideo)
2522SiS_SenseCh(struct sis_video_info *ivideo)
2523{ 2509{
2524#if defined(CONFIG_FB_SIS_300) || defined(CONFIG_FB_SIS_315) 2510#if defined(CONFIG_FB_SIS_300) || defined(CONFIG_FB_SIS_315)
2525 u8 temp1, temp2; 2511 u8 temp1, temp2;
@@ -2643,8 +2629,7 @@ SiS_SenseCh(struct sis_video_info *ivideo)
2643 } 2629 }
2644} 2630}
2645 2631
2646static void __devinit 2632static void sisfb_get_VB_type(struct sis_video_info *ivideo)
2647sisfb_get_VB_type(struct sis_video_info *ivideo)
2648{ 2633{
2649 char stdstr[] = "sisfb: Detected"; 2634 char stdstr[] = "sisfb: Detected";
2650 char bridgestr[] = "video bridge"; 2635 char bridgestr[] = "video bridge";
@@ -2906,8 +2891,7 @@ sisfb_engine_init(struct sis_video_info *ivideo)
2906 ivideo->engineok = 1; 2891 ivideo->engineok = 1;
2907} 2892}
2908 2893
2909static void __devinit 2894static void sisfb_detect_lcd_type(struct sis_video_info *ivideo)
2910sisfb_detect_lcd_type(struct sis_video_info *ivideo)
2911{ 2895{
2912 u8 reg; 2896 u8 reg;
2913 int i; 2897 int i;
@@ -2962,8 +2946,7 @@ sisfb_detect_lcd_type(struct sis_video_info *ivideo)
2962 ivideo->lcdxres, ivideo->lcdyres); 2946 ivideo->lcdxres, ivideo->lcdyres);
2963} 2947}
2964 2948
2965static void __devinit 2949static void sisfb_save_pdc_emi(struct sis_video_info *ivideo)
2966sisfb_save_pdc_emi(struct sis_video_info *ivideo)
2967{ 2950{
2968#ifdef CONFIG_FB_SIS_300 2951#ifdef CONFIG_FB_SIS_300
2969 /* Save the current PanelDelayCompensation if the LCD is currently used */ 2952 /* Save the current PanelDelayCompensation if the LCD is currently used */
@@ -3081,8 +3064,7 @@ sisfb_save_pdc_emi(struct sis_video_info *ivideo)
3081 3064
3082/* -------------------- Memory manager routines ---------------------- */ 3065/* -------------------- Memory manager routines ---------------------- */
3083 3066
3084static u32 __devinit 3067static u32 sisfb_getheapstart(struct sis_video_info *ivideo)
3085sisfb_getheapstart(struct sis_video_info *ivideo)
3086{ 3068{
3087 u32 ret = ivideo->sisfb_parm_mem * 1024; 3069 u32 ret = ivideo->sisfb_parm_mem * 1024;
3088 u32 maxoffs = ivideo->video_size - ivideo->hwcursor_size - ivideo->cmdQueueSize; 3070 u32 maxoffs = ivideo->video_size - ivideo->hwcursor_size - ivideo->cmdQueueSize;
@@ -3128,8 +3110,7 @@ sisfb_getheapstart(struct sis_video_info *ivideo)
3128 return ret; 3110 return ret;
3129} 3111}
3130 3112
3131static u32 __devinit 3113static u32 sisfb_getheapsize(struct sis_video_info *ivideo)
3132sisfb_getheapsize(struct sis_video_info *ivideo)
3133{ 3114{
3134 u32 max = ivideo->video_size - ivideo->hwcursor_size - ivideo->cmdQueueSize; 3115 u32 max = ivideo->video_size - ivideo->hwcursor_size - ivideo->cmdQueueSize;
3135 u32 ret = 0; 3116 u32 ret = 0;
@@ -3154,8 +3135,7 @@ sisfb_getheapsize(struct sis_video_info *ivideo)
3154 return ret; 3135 return ret;
3155} 3136}
3156 3137
3157static int __devinit 3138static int sisfb_heap_init(struct sis_video_info *ivideo)
3158sisfb_heap_init(struct sis_video_info *ivideo)
3159{ 3139{
3160 struct SIS_OH *poh; 3140 struct SIS_OH *poh;
3161 3141
@@ -4061,8 +4041,8 @@ static int __init sisfb_setup(char *options)
4061} 4041}
4062#endif 4042#endif
4063 4043
4064static int __devinit 4044static int sisfb_check_rom(void __iomem *rom_base,
4065sisfb_check_rom(void __iomem *rom_base, struct sis_video_info *ivideo) 4045 struct sis_video_info *ivideo)
4066{ 4046{
4067 void __iomem *rom; 4047 void __iomem *rom;
4068 int romptr; 4048 int romptr;
@@ -4089,8 +4069,7 @@ sisfb_check_rom(void __iomem *rom_base, struct sis_video_info *ivideo)
4089 return 1; 4069 return 1;
4090} 4070}
4091 4071
4092static unsigned char * __devinit 4072static unsigned char *sisfb_find_rom(struct pci_dev *pdev)
4093sisfb_find_rom(struct pci_dev *pdev)
4094{ 4073{
4095 struct sis_video_info *ivideo = pci_get_drvdata(pdev); 4074 struct sis_video_info *ivideo = pci_get_drvdata(pdev);
4096 void __iomem *rom_base; 4075 void __iomem *rom_base;
@@ -4149,9 +4128,8 @@ sisfb_find_rom(struct pci_dev *pdev)
4149 return myrombase; 4128 return myrombase;
4150} 4129}
4151 4130
4152static void __devinit 4131static void sisfb_post_map_vram(struct sis_video_info *ivideo,
4153sisfb_post_map_vram(struct sis_video_info *ivideo, unsigned int *mapsize, 4132 unsigned int *mapsize, unsigned int min)
4154 unsigned int min)
4155{ 4133{
4156 if (*mapsize < (min << 20)) 4134 if (*mapsize < (min << 20))
4157 return; 4135 return;
@@ -4176,8 +4154,7 @@ sisfb_post_map_vram(struct sis_video_info *ivideo, unsigned int *mapsize,
4176} 4154}
4177 4155
4178#ifdef CONFIG_FB_SIS_300 4156#ifdef CONFIG_FB_SIS_300
4179static int __devinit 4157static int sisfb_post_300_buswidth(struct sis_video_info *ivideo)
4180sisfb_post_300_buswidth(struct sis_video_info *ivideo)
4181{ 4158{
4182 void __iomem *FBAddress = ivideo->video_vbase; 4159 void __iomem *FBAddress = ivideo->video_vbase;
4183 unsigned short temp; 4160 unsigned short temp;
@@ -4222,7 +4199,7 @@ sisfb_post_300_buswidth(struct sis_video_info *ivideo)
4222 return 1; /* 32bit */ 4199 return 1; /* 32bit */
4223} 4200}
4224 4201
4225static const unsigned short __devinitconst SiS_DRAMType[17][5] = { 4202static const unsigned short SiS_DRAMType[17][5] = {
4226 {0x0C,0x0A,0x02,0x40,0x39}, 4203 {0x0C,0x0A,0x02,0x40,0x39},
4227 {0x0D,0x0A,0x01,0x40,0x48}, 4204 {0x0D,0x0A,0x01,0x40,0x48},
4228 {0x0C,0x09,0x02,0x20,0x35}, 4205 {0x0C,0x09,0x02,0x20,0x35},
@@ -4242,10 +4219,9 @@ static const unsigned short __devinitconst SiS_DRAMType[17][5] = {
4242 {0x09,0x08,0x01,0x01,0x00} 4219 {0x09,0x08,0x01,0x01,0x00}
4243}; 4220};
4244 4221
4245static int __devinit 4222static int sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration,
4246sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth, 4223 int buswidth, int PseudoRankCapacity,
4247 int PseudoRankCapacity, int PseudoAdrPinCount, 4224 int PseudoAdrPinCount, unsigned int mapsize)
4248 unsigned int mapsize)
4249{ 4225{
4250 void __iomem *FBAddr = ivideo->video_vbase; 4226 void __iomem *FBAddr = ivideo->video_vbase;
4251 unsigned short sr14; 4227 unsigned short sr14;
@@ -4309,8 +4285,7 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
4309 return 0; 4285 return 0;
4310} 4286}
4311 4287
4312static void __devinit 4288static void sisfb_post_300_ramsize(struct pci_dev *pdev, unsigned int mapsize)
4313sisfb_post_300_ramsize(struct pci_dev *pdev, unsigned int mapsize)
4314{ 4289{
4315 struct sis_video_info *ivideo = pci_get_drvdata(pdev); 4290 struct sis_video_info *ivideo = pci_get_drvdata(pdev);
4316 int i, j, buswidth; 4291 int i, j, buswidth;
@@ -4335,8 +4310,7 @@ sisfb_post_300_ramsize(struct pci_dev *pdev, unsigned int mapsize)
4335 } 4310 }
4336} 4311}
4337 4312
4338static void __devinit 4313static void sisfb_post_sis300(struct pci_dev *pdev)
4339sisfb_post_sis300(struct pci_dev *pdev)
4340{ 4314{
4341 struct sis_video_info *ivideo = pci_get_drvdata(pdev); 4315 struct sis_video_info *ivideo = pci_get_drvdata(pdev);
4342 unsigned char *bios = ivideo->SiS_Pr.VirtualRomBase; 4316 unsigned char *bios = ivideo->SiS_Pr.VirtualRomBase;
@@ -4547,8 +4521,7 @@ sisfb_post_sis300(struct pci_dev *pdev)
4547 4521
4548#ifdef CONFIG_FB_SIS_315 4522#ifdef CONFIG_FB_SIS_315
4549#if 0 4523#if 0
4550static void __devinit 4524static void sisfb_post_sis315330(struct pci_dev *pdev)
4551sisfb_post_sis315330(struct pci_dev *pdev)
4552{ 4525{
4553 /* TODO */ 4526 /* TODO */
4554} 4527}
@@ -4559,8 +4532,7 @@ static inline int sisfb_xgi_is21(struct sis_video_info *ivideo)
4559 return ivideo->chip_real_id == XGI_21; 4532 return ivideo->chip_real_id == XGI_21;
4560} 4533}
4561 4534
4562static void __devinit 4535static void sisfb_post_xgi_delay(struct sis_video_info *ivideo, int delay)
4563sisfb_post_xgi_delay(struct sis_video_info *ivideo, int delay)
4564{ 4536{
4565 unsigned int i; 4537 unsigned int i;
4566 u8 reg; 4538 u8 reg;
@@ -4571,9 +4543,9 @@ sisfb_post_xgi_delay(struct sis_video_info *ivideo, int delay)
4571 } 4543 }
4572} 4544}
4573 4545
4574static int __devinit 4546static int sisfb_find_host_bridge(struct sis_video_info *ivideo,
4575sisfb_find_host_bridge(struct sis_video_info *ivideo, struct pci_dev *mypdev, 4547 struct pci_dev *mypdev,
4576 unsigned short pcivendor) 4548 unsigned short pcivendor)
4577{ 4549{
4578 struct pci_dev *pdev = NULL; 4550 struct pci_dev *pdev = NULL;
4579 unsigned short temp; 4551 unsigned short temp;
@@ -4591,9 +4563,8 @@ sisfb_find_host_bridge(struct sis_video_info *ivideo, struct pci_dev *mypdev,
4591 return ret; 4563 return ret;
4592} 4564}
4593 4565
4594static int __devinit 4566static int sisfb_post_xgi_rwtest(struct sis_video_info *ivideo, int starta,
4595sisfb_post_xgi_rwtest(struct sis_video_info *ivideo, int starta, 4567 unsigned int enda, unsigned int mapsize)
4596 unsigned int enda, unsigned int mapsize)
4597{ 4568{
4598 unsigned int pos; 4569 unsigned int pos;
4599 int i; 4570 int i;
@@ -4623,8 +4594,7 @@ sisfb_post_xgi_rwtest(struct sis_video_info *ivideo, int starta,
4623 return 1; 4594 return 1;
4624} 4595}
4625 4596
4626static int __devinit 4597static int sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)
4627sisfb_post_xgi_ramsize(struct sis_video_info *ivideo)
4628{ 4598{
4629 unsigned int buswidth, ranksize, channelab, mapsize; 4599 unsigned int buswidth, ranksize, channelab, mapsize;
4630 int i, j, k, l, status; 4600 int i, j, k, l, status;
@@ -4876,8 +4846,7 @@ bail_out:
4876 return status; 4846 return status;
4877} 4847}
4878 4848
4879static void __devinit 4849static void sisfb_post_xgi_setclocks(struct sis_video_info *ivideo, u8 regb)
4880sisfb_post_xgi_setclocks(struct sis_video_info *ivideo, u8 regb)
4881{ 4850{
4882 u8 v1, v2, v3; 4851 u8 v1, v2, v3;
4883 int index; 4852 int index;
@@ -4932,8 +4901,8 @@ sisfb_post_xgi_setclocks(struct sis_video_info *ivideo, u8 regb)
4932 sisfb_post_xgi_delay(ivideo, 0x43); 4901 sisfb_post_xgi_delay(ivideo, 0x43);
4933} 4902}
4934 4903
4935static void __devinit 4904static void sisfb_post_xgi_ddr2_mrs_default(struct sis_video_info *ivideo,
4936sisfb_post_xgi_ddr2_mrs_default(struct sis_video_info *ivideo, u8 regb) 4905 u8 regb)
4937{ 4906{
4938 unsigned char *bios = ivideo->bios_abase; 4907 unsigned char *bios = ivideo->bios_abase;
4939 u8 v1; 4908 u8 v1;
@@ -4973,8 +4942,7 @@ sisfb_post_xgi_ddr2_mrs_default(struct sis_video_info *ivideo, u8 regb)
4973 sisfb_post_xgi_delay(ivideo, 1); 4942 sisfb_post_xgi_delay(ivideo, 1);
4974} 4943}
4975 4944
4976static void __devinit 4945static void sisfb_post_xgi_ddr2_mrs_xg21(struct sis_video_info *ivideo)
4977sisfb_post_xgi_ddr2_mrs_xg21(struct sis_video_info *ivideo)
4978{ 4946{
4979 sisfb_post_xgi_setclocks(ivideo, 1); 4947 sisfb_post_xgi_setclocks(ivideo, 1);
4980 4948
@@ -5015,8 +4983,7 @@ sisfb_post_xgi_ddr2_mrs_xg21(struct sis_video_info *ivideo)
5015 sisfb_post_xgi_delay(ivideo, 1); 4983 sisfb_post_xgi_delay(ivideo, 1);
5016} 4984}
5017 4985
5018static void __devinit 4986static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb)
5019sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb)
5020{ 4987{
5021 unsigned char *bios = ivideo->bios_abase; 4988 unsigned char *bios = ivideo->bios_abase;
5022 static const u8 cs158[8] = { 4989 static const u8 cs158[8] = {
@@ -5061,8 +5028,7 @@ sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb)
5061 sisfb_post_xgi_ddr2_mrs_default(ivideo, regb); 5028 sisfb_post_xgi_ddr2_mrs_default(ivideo, regb);
5062} 5029}
5063 5030
5064static u8 __devinit 5031static u8 sisfb_post_xgi_ramtype(struct sis_video_info *ivideo)
5065sisfb_post_xgi_ramtype(struct sis_video_info *ivideo)
5066{ 5032{
5067 unsigned char *bios = ivideo->bios_abase; 5033 unsigned char *bios = ivideo->bios_abase;
5068 u8 ramtype; 5034 u8 ramtype;
@@ -5101,8 +5067,7 @@ sisfb_post_xgi_ramtype(struct sis_video_info *ivideo)
5101 return ramtype; 5067 return ramtype;
5102} 5068}
5103 5069
5104static int __devinit 5070static int sisfb_post_xgi(struct pci_dev *pdev)
5105sisfb_post_xgi(struct pci_dev *pdev)
5106{ 5071{
5107 struct sis_video_info *ivideo = pci_get_drvdata(pdev); 5072 struct sis_video_info *ivideo = pci_get_drvdata(pdev);
5108 unsigned char *bios = ivideo->bios_abase; 5073 unsigned char *bios = ivideo->bios_abase;
@@ -5839,8 +5804,7 @@ sisfb_post_xgi(struct pci_dev *pdev)
5839} 5804}
5840#endif 5805#endif
5841 5806
5842static int __devinit 5807static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
5843sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
5844{ 5808{
5845 struct sisfb_chip_info *chipinfo = &sisfb_chip_info[ent->driver_data]; 5809 struct sisfb_chip_info *chipinfo = &sisfb_chip_info[ent->driver_data];
5846 struct sis_video_info *ivideo = NULL; 5810 struct sis_video_info *ivideo = NULL;
@@ -6530,7 +6494,7 @@ error_3: vfree(ivideo->bios_abase);
6530/* PCI DEVICE HANDLING */ 6494/* PCI DEVICE HANDLING */
6531/*****************************************************/ 6495/*****************************************************/
6532 6496
6533static void __devexit sisfb_remove(struct pci_dev *pdev) 6497static void sisfb_remove(struct pci_dev *pdev)
6534{ 6498{
6535 struct sis_video_info *ivideo = pci_get_drvdata(pdev); 6499 struct sis_video_info *ivideo = pci_get_drvdata(pdev);
6536 struct fb_info *sis_fb_info = ivideo->memyselfandi; 6500 struct fb_info *sis_fb_info = ivideo->memyselfandi;
@@ -6591,7 +6555,7 @@ static struct pci_driver sisfb_driver = {
6591 .name = "sisfb", 6555 .name = "sisfb",
6592 .id_table = sisfb_pci_table, 6556 .id_table = sisfb_pci_table,
6593 .probe = sisfb_probe, 6557 .probe = sisfb_probe,
6594 .remove = __devexit_p(sisfb_remove) 6558 .remove = sisfb_remove,
6595}; 6559};
6596 6560
6597static int __init sisfb_init(void) 6561static int __init sisfb_init(void)
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h
index 9540e977270e..32e23c209430 100644
--- a/drivers/video/sis/sis_main.h
+++ b/drivers/video/sis/sis_main.h
@@ -98,7 +98,7 @@ static struct sisfb_chip_info {
98 int hwcursor_size; 98 int hwcursor_size;
99 int CRT2_write_enable; 99 int CRT2_write_enable;
100 const char *chip_name; 100 const char *chip_name;
101} sisfb_chip_info[] __devinitdata = { 101} sisfb_chip_info[] = {
102 { SIS_300, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 300/305" }, 102 { SIS_300, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 300/305" },
103 { SIS_540, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 540" }, 103 { SIS_540, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 540" },
104 { SIS_630, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 630" }, 104 { SIS_630, SIS_300_VGA, 0, HW_CURSOR_AREA_SIZE_300 * 2, SIS_CRT2_WENABLE_300, "SiS 630" },
@@ -113,7 +113,7 @@ static struct sisfb_chip_info {
113 { XGI_40, SIS_315_VGA, 1, HW_CURSOR_AREA_SIZE_315 * 4, SIS_CRT2_WENABLE_315, "XGI V3XT/V5/V8" }, 113 { XGI_40, SIS_315_VGA, 1, HW_CURSOR_AREA_SIZE_315 * 4, SIS_CRT2_WENABLE_315, "XGI V3XT/V5/V8" },
114}; 114};
115 115
116static struct pci_device_id __devinitdata sisfb_pci_table[] = { 116static struct pci_device_id sisfb_pci_table[] = {
117#ifdef CONFIG_FB_SIS_300 117#ifdef CONFIG_FB_SIS_300
118 { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 118 { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
119 { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, 119 { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -317,7 +317,7 @@ static struct _sis_lcd_data {
317 u16 xres; 317 u16 xres;
318 u16 yres; 318 u16 yres;
319 u8 default_mode_idx; 319 u8 default_mode_idx;
320} sis_lcd_data[] __devinitdata = { 320} sis_lcd_data[] = {
321 { LCD_640x480, 640, 480, 23 }, 321 { LCD_640x480, 640, 480, 23 },
322 { LCD_800x600, 800, 600, 43 }, 322 { LCD_800x600, 800, 600, 43 },
323 { LCD_1024x600, 1024, 600, 67 }, 323 { LCD_1024x600, 1024, 600, 67 },
@@ -339,21 +339,21 @@ static struct _sis_lcd_data {
339}; 339};
340 340
341/* CR36 evaluation */ 341/* CR36 evaluation */
342static unsigned short sis300paneltype[] __devinitdata = { 342static unsigned short sis300paneltype[] = {
343 LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, 343 LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
344 LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768, 344 LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768,
345 LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, 345 LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN,
346 LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN 346 LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN, LCD_UNKNOWN
347}; 347};
348 348
349static unsigned short sis310paneltype[] __devinitdata = { 349static unsigned short sis310paneltype[] = {
350 LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, 350 LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
351 LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, 351 LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960,
352 LCD_1152x768, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, 352 LCD_1152x768, LCD_1400x1050, LCD_1280x768, LCD_1600x1200,
353 LCD_320x240_2, LCD_320x240_3, LCD_UNKNOWN, LCD_UNKNOWN 353 LCD_320x240_2, LCD_320x240_3, LCD_UNKNOWN, LCD_UNKNOWN
354}; 354};
355 355
356static unsigned short sis661paneltype[] __devinitdata = { 356static unsigned short sis661paneltype[] = {
357 LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, 357 LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024,
358 LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, 358 LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960,
359 LCD_1280x854, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, 359 LCD_1280x854, LCD_1400x1050, LCD_1280x768, LCD_1600x1200,
@@ -466,7 +466,7 @@ static struct _sisfbddcsmodes {
466 u16 h; 466 u16 h;
467 u16 v; 467 u16 v;
468 u32 d; 468 u32 d;
469} sisfb_ddcsmodes[] __devinitdata = { 469} sisfb_ddcsmodes[] = {
470 { 0x10000, 67, 75, 108000}, 470 { 0x10000, 67, 75, 108000},
471 { 0x08000, 48, 72, 50000}, 471 { 0x08000, 48, 72, 50000},
472 { 0x04000, 46, 75, 49500}, 472 { 0x04000, 46, 75, 49500},
@@ -488,7 +488,7 @@ static struct _sisfbddcfmodes {
488 u16 v; 488 u16 v;
489 u16 h; 489 u16 h;
490 u32 d; 490 u32 d;
491} sisfb_ddcfmodes[] __devinitdata = { 491} sisfb_ddcfmodes[] = {
492 { 1280, 1024, 85, 92, 157500}, 492 { 1280, 1024, 85, 92, 157500},
493 { 1600, 1200, 60, 75, 162000}, 493 { 1600, 1200, 60, 75, 162000},
494 { 1600, 1200, 65, 82, 175500}, 494 { 1600, 1200, 65, 82, 175500},
@@ -505,7 +505,7 @@ static struct _chswtable {
505 u16 subsysCard; 505 u16 subsysCard;
506 char *vendorName; 506 char *vendorName;
507 char *cardName; 507 char *cardName;
508} mychswtable[] __devinitdata = { 508} mychswtable[] = {
509 { 0x1631, 0x1002, "Mitachi", "0x1002" }, 509 { 0x1631, 0x1002, "Mitachi", "0x1002" },
510 { 0x1071, 0x7521, "Mitac" , "7521P" }, 510 { 0x1071, 0x7521, "Mitac" , "7521P" },
511 { 0, 0, "" , "" } 511 { 0, 0, "" , "" }
@@ -525,7 +525,7 @@ static struct _customttable {
525 char *cardName; 525 char *cardName;
526 u32 SpecialID; 526 u32 SpecialID;
527 char *optionName; 527 char *optionName;
528} mycustomttable[] __devinitdata = { 528} mycustomttable[] = {
529 { SIS_630, "2.00.07", "09/27/2002-13:38:25", 529 { SIS_630, "2.00.07", "09/27/2002-13:38:25",
530 0x3240A8, 530 0x3240A8,
531 { 0x220, 0x227, 0x228, 0x229, 0x0ee }, 531 { 0x220, 0x227, 0x228, 0x229, 0x0ee },
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 5b6abc6de84b..2d4694c6b9e0 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -63,7 +63,7 @@
63/* 63/*
64 * Driver data 64 * Driver data
65 */ 65 */
66static char *mode_option __devinitdata; 66static char *mode_option;
67 67
68/* 68/*
69 * If your driver supports multiple boards, you should make the 69 * If your driver supports multiple boards, you should make the
@@ -84,7 +84,7 @@ struct xxx_par;
84 * if we don't use modedb. If we do use modedb see xxxfb_init how to use it 84 * if we don't use modedb. If we do use modedb see xxxfb_init how to use it
85 * to get a fb_var_screeninfo. Otherwise define a default var as well. 85 * to get a fb_var_screeninfo. Otherwise define a default var as well.
86 */ 86 */
87static struct fb_fix_screeninfo xxxfb_fix __devinitdata = { 87static struct fb_fix_screeninfo xxxfb_fix = {
88 .id = "FB's name", 88 .id = "FB's name",
89 .type = FB_TYPE_PACKED_PIXELS, 89 .type = FB_TYPE_PACKED_PIXELS,
90 .visual = FB_VISUAL_PSEUDOCOLOR, 90 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -678,8 +678,7 @@ static struct fb_ops xxxfb_ops = {
678 */ 678 */
679 679
680/* static int __init xxfb_probe (struct platform_device *pdev) -- for platform devs */ 680/* static int __init xxfb_probe (struct platform_device *pdev) -- for platform devs */
681static int __devinit xxxfb_probe(struct pci_dev *dev, 681static int xxxfb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
682 const struct pci_device_id *ent)
683{ 682{
684 struct fb_info *info; 683 struct fb_info *info;
685 struct xxx_par *par; 684 struct xxx_par *par;
@@ -705,9 +704,7 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
705 */ 704 */
706 info->screen_base = framebuffer_virtual_memory; 705 info->screen_base = framebuffer_virtual_memory;
707 info->fbops = &xxxfb_ops; 706 info->fbops = &xxxfb_ops;
708 info->fix = xxxfb_fix; /* this will be the only time xxxfb_fix will be 707 info->fix = xxxfb_fix;
709 * used, so mark it as __devinitdata
710 */
711 info->pseudo_palette = pseudo_palette; /* The pseudopalette is an 708 info->pseudo_palette = pseudo_palette; /* The pseudopalette is an
712 * 16-member array 709 * 16-member array
713 */ 710 */
@@ -836,8 +833,8 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
836 /* 833 /*
837 * Cleanup 834 * Cleanup
838 */ 835 */
839/* static void __devexit xxxfb_remove(struct platform_device *pdev) */ 836/* static void xxxfb_remove(struct platform_device *pdev) */
840static void __devexit xxxfb_remove(struct pci_dev *dev) 837static void xxxfb_remove(struct pci_dev *dev)
841{ 838{
842 struct fb_info *info = pci_get_drvdata(dev); 839 struct fb_info *info = pci_get_drvdata(dev);
843 /* or platform_get_drvdata(pdev); */ 840 /* or platform_get_drvdata(pdev); */
@@ -899,7 +896,7 @@ static struct pci_driver xxxfb_driver = {
899 .name = "xxxfb", 896 .name = "xxxfb",
900 .id_table = xxxfb_id_table, 897 .id_table = xxxfb_id_table,
901 .probe = xxxfb_probe, 898 .probe = xxxfb_probe,
902 .remove = __devexit_p(xxxfb_remove), 899 .remove = xxxfb_remove,
903 .suspend = xxxfb_suspend, /* optional but recommended */ 900 .suspend = xxxfb_suspend, /* optional but recommended */
904 .resume = xxxfb_resume, /* optional but recommended */ 901 .resume = xxxfb_resume, /* optional but recommended */
905}; 902};
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 3690effbedcc..1501979099dc 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -46,7 +46,7 @@
46static char *fb_mode = "640x480-16@60"; 46static char *fb_mode = "640x480-16@60";
47static unsigned long default_bpp = 16; 47static unsigned long default_bpp = 16;
48 48
49static struct fb_videomode __devinitdata sm501_default_mode = { 49static struct fb_videomode sm501_default_mode = {
50 .refresh = 60, 50 .refresh = 60,
51 .xres = 640, 51 .xres = 640,
52 .yres = 480, 52 .yres = 480,
@@ -1664,8 +1664,7 @@ static void sm501fb_stop(struct sm501fb_info *info)
1664 resource_size(info->regs_res)); 1664 resource_size(info->regs_res));
1665} 1665}
1666 1666
1667static int __devinit sm501fb_init_fb(struct fb_info *fb, 1667static int sm501fb_init_fb(struct fb_info *fb, enum sm501_controller head,
1668 enum sm501_controller head,
1669 const char *fbname) 1668 const char *fbname)
1670{ 1669{
1671 struct sm501_platdata_fbsub *pd; 1670 struct sm501_platdata_fbsub *pd;
@@ -1850,8 +1849,8 @@ static struct sm501_platdata_fb sm501fb_def_pdata = {
1850static char driver_name_crt[] = "sm501fb-crt"; 1849static char driver_name_crt[] = "sm501fb-crt";
1851static char driver_name_pnl[] = "sm501fb-panel"; 1850static char driver_name_pnl[] = "sm501fb-panel";
1852 1851
1853static int __devinit sm501fb_probe_one(struct sm501fb_info *info, 1852static int sm501fb_probe_one(struct sm501fb_info *info,
1854 enum sm501_controller head) 1853 enum sm501_controller head)
1855{ 1854{
1856 unsigned char *name = (head == HEAD_CRT) ? "crt" : "panel"; 1855 unsigned char *name = (head == HEAD_CRT) ? "crt" : "panel";
1857 struct sm501_platdata_fbsub *pd; 1856 struct sm501_platdata_fbsub *pd;
@@ -1892,9 +1891,8 @@ static void sm501_free_init_fb(struct sm501fb_info *info,
1892 fb_dealloc_cmap(&fbi->cmap); 1891 fb_dealloc_cmap(&fbi->cmap);
1893} 1892}
1894 1893
1895static int __devinit sm501fb_start_one(struct sm501fb_info *info, 1894static int sm501fb_start_one(struct sm501fb_info *info,
1896 enum sm501_controller head, 1895 enum sm501_controller head, const char *drvname)
1897 const char *drvname)
1898{ 1896{
1899 struct fb_info *fbi = info->fb[head]; 1897 struct fb_info *fbi = info->fb[head];
1900 int ret; 1898 int ret;
@@ -1922,7 +1920,7 @@ static int __devinit sm501fb_start_one(struct sm501fb_info *info,
1922 return 0; 1920 return 0;
1923} 1921}
1924 1922
1925static int __devinit sm501fb_probe(struct platform_device *pdev) 1923static int sm501fb_probe(struct platform_device *pdev)
1926{ 1924{
1927 struct sm501fb_info *info; 1925 struct sm501fb_info *info;
1928 struct device *dev = &pdev->dev; 1926 struct device *dev = &pdev->dev;
diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c
index 6101f5c2f62f..4d99dd7a6831 100644
--- a/drivers/video/ssd1307fb.c
+++ b/drivers/video/ssd1307fb.c
@@ -36,7 +36,7 @@ struct ssd1307fb_par {
36 int reset; 36 int reset;
37}; 37};
38 38
39static struct fb_fix_screeninfo ssd1307fb_fix __devinitdata = { 39static struct fb_fix_screeninfo ssd1307fb_fix = {
40 .id = "Solomon SSD1307", 40 .id = "Solomon SSD1307",
41 .type = FB_TYPE_PACKED_PIXELS, 41 .type = FB_TYPE_PACKED_PIXELS,
42 .visual = FB_VISUAL_MONO10, 42 .visual = FB_VISUAL_MONO10,
@@ -47,7 +47,7 @@ static struct fb_fix_screeninfo ssd1307fb_fix __devinitdata = {
47 .accel = FB_ACCEL_NONE, 47 .accel = FB_ACCEL_NONE,
48}; 48};
49 49
50static struct fb_var_screeninfo ssd1307fb_var __devinitdata = { 50static struct fb_var_screeninfo ssd1307fb_var = {
51 .xres = SSD1307FB_WIDTH, 51 .xres = SSD1307FB_WIDTH,
52 .yres = SSD1307FB_HEIGHT, 52 .yres = SSD1307FB_HEIGHT,
53 .xres_virtual = SSD1307FB_WIDTH, 53 .xres_virtual = SSD1307FB_WIDTH,
@@ -227,7 +227,8 @@ static struct fb_deferred_io ssd1307fb_defio = {
227 .deferred_io = ssd1307fb_deferred_io, 227 .deferred_io = ssd1307fb_deferred_io,
228}; 228};
229 229
230static int __devinit ssd1307fb_probe(struct i2c_client *client, const struct i2c_device_id *id) 230static int ssd1307fb_probe(struct i2c_client *client,
231 const struct i2c_device_id *id)
231{ 232{
232 struct fb_info *info; 233 struct fb_info *info;
233 u32 vmem_size = SSD1307FB_WIDTH * SSD1307FB_HEIGHT / 8; 234 u32 vmem_size = SSD1307FB_WIDTH * SSD1307FB_HEIGHT / 8;
@@ -352,7 +353,7 @@ fb_alloc_error:
352 return ret; 353 return ret;
353} 354}
354 355
355static int __devexit ssd1307fb_remove(struct i2c_client *client) 356static int ssd1307fb_remove(struct i2c_client *client)
356{ 357{
357 struct fb_info *info = i2c_get_clientdata(client); 358 struct fb_info *info = i2c_get_clientdata(client);
358 struct ssd1307fb_par *par = info->par; 359 struct ssd1307fb_par *par = info->par;
@@ -380,7 +381,7 @@ MODULE_DEVICE_TABLE(of, ssd1307fb_of_match);
380 381
381static struct i2c_driver ssd1307fb_driver = { 382static struct i2c_driver ssd1307fb_driver = {
382 .probe = ssd1307fb_probe, 383 .probe = ssd1307fb_probe,
383 .remove = __devexit_p(ssd1307fb_remove), 384 .remove = ssd1307fb_remove,
384 .id_table = ssd1307fb_i2c_id, 385 .id_table = ssd1307fb_i2c_id,
385 .driver = { 386 .driver = {
386 .name = "ssd1307fb", 387 .name = "ssd1307fb",
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 111fb32e8769..9c00026e3ae2 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -104,7 +104,7 @@ static bool slowpci; /* slow PCI settings */
104*/ 104*/
105#define DEFAULT_VIDEO_MODE "640x480@60" 105#define DEFAULT_VIDEO_MODE "640x480@60"
106 106
107static char *mode_option __devinitdata = DEFAULT_VIDEO_MODE; 107static char *mode_option = DEFAULT_VIDEO_MODE;
108 108
109enum { 109enum {
110 ID_VOODOO1 = 0, 110 ID_VOODOO1 = 0,
@@ -113,7 +113,7 @@ enum {
113 113
114#define IS_VOODOO2(par) ((par)->type == ID_VOODOO2) 114#define IS_VOODOO2(par) ((par)->type == ID_VOODOO2)
115 115
116static struct sst_spec voodoo_spec[] __devinitdata = { 116static struct sst_spec voodoo_spec[] = {
117 { .name = "Voodoo Graphics", .default_gfx_clock = 50000, .max_gfxclk = 60 }, 117 { .name = "Voodoo Graphics", .default_gfx_clock = 50000, .max_gfxclk = 60 },
118 { .name = "Voodoo2", .default_gfx_clock = 75000, .max_gfxclk = 85 }, 118 { .name = "Voodoo2", .default_gfx_clock = 75000, .max_gfxclk = 85 },
119}; 119};
@@ -822,7 +822,7 @@ static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
822/* 822/*
823 * get lfb size 823 * get lfb size
824 */ 824 */
825static int __devinit sst_get_memsize(struct fb_info *info, __u32 *memsize) 825static int sst_get_memsize(struct fb_info *info, __u32 *memsize)
826{ 826{
827 u8 __iomem *fbbase_virt = info->screen_base; 827 u8 __iomem *fbbase_virt = info->screen_base;
828 828
@@ -865,7 +865,7 @@ static int __devinit sst_get_memsize(struct fb_info *info, __u32 *memsize)
865/* fbi should be idle, and fifo emty and mem disabled */ 865/* fbi should be idle, and fifo emty and mem disabled */
866/* supposed to detect AT&T ATT20C409 and Ti TVP3409 ramdacs */ 866/* supposed to detect AT&T ATT20C409 and Ti TVP3409 ramdacs */
867 867
868static int __devinit sst_detect_att(struct fb_info *info) 868static int sst_detect_att(struct fb_info *info)
869{ 869{
870 struct sstfb_par *par = info->par; 870 struct sstfb_par *par = info->par;
871 int i, mir, dir; 871 int i, mir, dir;
@@ -890,7 +890,7 @@ static int __devinit sst_detect_att(struct fb_info *info)
890 return 0; 890 return 0;
891} 891}
892 892
893static int __devinit sst_detect_ti(struct fb_info *info) 893static int sst_detect_ti(struct fb_info *info)
894{ 894{
895 struct sstfb_par *par = info->par; 895 struct sstfb_par *par = info->par;
896 int i, mir, dir; 896 int i, mir, dir;
@@ -926,7 +926,7 @@ static int __devinit sst_detect_ti(struct fb_info *info)
926 * touched... 926 * touched...
927 * is it really safe ? how can i reset this ramdac ? geee... 927 * is it really safe ? how can i reset this ramdac ? geee...
928 */ 928 */
929static int __devinit sst_detect_ics(struct fb_info *info) 929static int sst_detect_ics(struct fb_info *info)
930{ 930{
931 struct sstfb_par *par = info->par; 931 struct sstfb_par *par = info->par;
932 int m_clk0_1, m_clk0_7, m_clk1_b; 932 int m_clk0_1, m_clk0_7, m_clk1_b;
@@ -1105,7 +1105,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)
1105 */ 1105 */
1106 1106
1107 1107
1108static struct dac_switch dacs[] __devinitdata = { 1108static struct dac_switch dacs[] = {
1109 { .name = "TI TVP3409", 1109 { .name = "TI TVP3409",
1110 .detect = sst_detect_ti, 1110 .detect = sst_detect_ti,
1111 .set_pll = sst_set_pll_att_ti, 1111 .set_pll = sst_set_pll_att_ti,
@@ -1121,7 +1121,7 @@ static struct dac_switch dacs[] __devinitdata = {
1121 .set_vidmod = sst_set_vidmod_ics }, 1121 .set_vidmod = sst_set_vidmod_ics },
1122}; 1122};
1123 1123
1124static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *par) 1124static int sst_detect_dactype(struct fb_info *info, struct sstfb_par *par)
1125{ 1125{
1126 int i, ret = 0; 1126 int i, ret = 0;
1127 1127
@@ -1140,7 +1140,7 @@ static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *
1140/* 1140/*
1141 * Internal Routines 1141 * Internal Routines
1142 */ 1142 */
1143static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par) 1143static int sst_init(struct fb_info *info, struct sstfb_par *par)
1144{ 1144{
1145 u32 fbiinit0, fbiinit1, fbiinit4; 1145 u32 fbiinit0, fbiinit1, fbiinit4;
1146 struct pci_dev *dev = par->dev; 1146 struct pci_dev *dev = par->dev;
@@ -1239,7 +1239,7 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
1239 return 1; 1239 return 1;
1240} 1240}
1241 1241
1242static void __devexit sst_shutdown(struct fb_info *info) 1242static void sst_shutdown(struct fb_info *info)
1243{ 1243{
1244 struct sstfb_par *par = info->par; 1244 struct sstfb_par *par = info->par;
1245 struct pci_dev *dev = par->dev; 1245 struct pci_dev *dev = par->dev;
@@ -1271,7 +1271,7 @@ static void __devexit sst_shutdown(struct fb_info *info)
1271/* 1271/*
1272 * Interface to the world 1272 * Interface to the world
1273 */ 1273 */
1274static int __devinit sstfb_setup(char *options) 1274static int sstfb_setup(char *options)
1275{ 1275{
1276 char *this_opt; 1276 char *this_opt;
1277 1277
@@ -1317,8 +1317,7 @@ static struct fb_ops sstfb_ops = {
1317 .fb_ioctl = sstfb_ioctl, 1317 .fb_ioctl = sstfb_ioctl,
1318}; 1318};
1319 1319
1320static int __devinit sstfb_probe(struct pci_dev *pdev, 1320static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1321 const struct pci_device_id *id)
1322{ 1321{
1323 struct fb_info *info; 1322 struct fb_info *info;
1324 struct fb_fix_screeninfo *fix; 1323 struct fb_fix_screeninfo *fix;
@@ -1458,7 +1457,7 @@ fail_mmio_mem:
1458 return -ENXIO; /* no voodoo detected */ 1457 return -ENXIO; /* no voodoo detected */
1459} 1458}
1460 1459
1461static void __devexit sstfb_remove(struct pci_dev *pdev) 1460static void sstfb_remove(struct pci_dev *pdev)
1462{ 1461{
1463 struct sstfb_par *par; 1462 struct sstfb_par *par;
1464 struct fb_info *info; 1463 struct fb_info *info;
@@ -1490,11 +1489,11 @@ static struct pci_driver sstfb_driver = {
1490 .name = "sstfb", 1489 .name = "sstfb",
1491 .id_table = sstfb_id_tbl, 1490 .id_table = sstfb_id_tbl,
1492 .probe = sstfb_probe, 1491 .probe = sstfb_probe,
1493 .remove = __devexit_p(sstfb_remove), 1492 .remove = sstfb_remove,
1494}; 1493};
1495 1494
1496 1495
1497static int __devinit sstfb_init(void) 1496static int sstfb_init(void)
1498{ 1497{
1499 char *option = NULL; 1498 char *option = NULL;
1500 1499
@@ -1505,7 +1504,7 @@ static int __devinit sstfb_init(void)
1505 return pci_register_driver(&sstfb_driver); 1504 return pci_register_driver(&sstfb_driver);
1506} 1505}
1507 1506
1508static void __devexit sstfb_exit(void) 1507static void sstfb_exit(void)
1509{ 1508{
1510 pci_unregister_driver(&sstfb_driver); 1509 pci_unregister_driver(&sstfb_driver);
1511} 1510}
diff --git a/drivers/video/sunxvr1000.c b/drivers/video/sunxvr1000.c
index 729a50722bdf..cc6f48bba36b 100644
--- a/drivers/video/sunxvr1000.c
+++ b/drivers/video/sunxvr1000.c
@@ -25,7 +25,7 @@ struct gfb_info {
25 u32 pseudo_palette[16]; 25 u32 pseudo_palette[16];
26}; 26};
27 27
28static int __devinit gfb_get_props(struct gfb_info *gp) 28static int gfb_get_props(struct gfb_info *gp)
29{ 29{
30 gp->width = of_getintprop_default(gp->of_node, "width", 0); 30 gp->width = of_getintprop_default(gp->of_node, "width", 0);
31 gp->height = of_getintprop_default(gp->of_node, "height", 0); 31 gp->height = of_getintprop_default(gp->of_node, "height", 0);
@@ -66,7 +66,7 @@ static struct fb_ops gfb_ops = {
66 .fb_imageblit = cfb_imageblit, 66 .fb_imageblit = cfb_imageblit,
67}; 67};
68 68
69static int __devinit gfb_set_fbinfo(struct gfb_info *gp) 69static int gfb_set_fbinfo(struct gfb_info *gp)
70{ 70{
71 struct fb_info *info = gp->info; 71 struct fb_info *info = gp->info;
72 struct fb_var_screeninfo *var = &info->var; 72 struct fb_var_screeninfo *var = &info->var;
@@ -111,7 +111,7 @@ static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
111 return 0; 111 return 0;
112} 112}
113 113
114static int __devinit gfb_probe(struct platform_device *op) 114static int gfb_probe(struct platform_device *op)
115{ 115{
116 struct device_node *dp = op->dev.of_node; 116 struct device_node *dp = op->dev.of_node;
117 struct fb_info *info; 117 struct fb_info *info;
@@ -173,7 +173,7 @@ err_out:
173 return err; 173 return err;
174} 174}
175 175
176static int __devexit gfb_remove(struct platform_device *op) 176static int gfb_remove(struct platform_device *op)
177{ 177{
178 struct fb_info *info = dev_get_drvdata(&op->dev); 178 struct fb_info *info = dev_get_drvdata(&op->dev);
179 struct gfb_info *gp = info->par; 179 struct gfb_info *gp = info->par;
@@ -201,7 +201,7 @@ MODULE_DEVICE_TABLE(of, ffb_match);
201 201
202static struct platform_driver gfb_driver = { 202static struct platform_driver gfb_driver = {
203 .probe = gfb_probe, 203 .probe = gfb_probe,
204 .remove = __devexit_p(gfb_remove), 204 .remove = gfb_remove,
205 .driver = { 205 .driver = {
206 .name = "gfb", 206 .name = "gfb",
207 .owner = THIS_MODULE, 207 .owner = THIS_MODULE,
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c
index 7fbcba86d1a2..843b6bab0483 100644
--- a/drivers/video/sunxvr2500.c
+++ b/drivers/video/sunxvr2500.c
@@ -29,7 +29,7 @@ struct s3d_info {
29 u32 pseudo_palette[16]; 29 u32 pseudo_palette[16];
30}; 30};
31 31
32static int __devinit s3d_get_props(struct s3d_info *sp) 32static int s3d_get_props(struct s3d_info *sp)
33{ 33{
34 sp->width = of_getintprop_default(sp->of_node, "width", 0); 34 sp->width = of_getintprop_default(sp->of_node, "width", 0);
35 sp->height = of_getintprop_default(sp->of_node, "height", 0); 35 sp->height = of_getintprop_default(sp->of_node, "height", 0);
@@ -70,7 +70,7 @@ static struct fb_ops s3d_ops = {
70 .fb_imageblit = cfb_imageblit, 70 .fb_imageblit = cfb_imageblit,
71}; 71};
72 72
73static int __devinit s3d_set_fbinfo(struct s3d_info *sp) 73static int s3d_set_fbinfo(struct s3d_info *sp)
74{ 74{
75 struct fb_info *info = sp->info; 75 struct fb_info *info = sp->info;
76 struct fb_var_screeninfo *var = &info->var; 76 struct fb_var_screeninfo *var = &info->var;
@@ -115,8 +115,8 @@ static int __devinit s3d_set_fbinfo(struct s3d_info *sp)
115 return 0; 115 return 0;
116} 116}
117 117
118static int __devinit s3d_pci_register(struct pci_dev *pdev, 118static int s3d_pci_register(struct pci_dev *pdev,
119 const struct pci_device_id *ent) 119 const struct pci_device_id *ent)
120{ 120{
121 struct fb_info *info; 121 struct fb_info *info;
122 struct s3d_info *sp; 122 struct s3d_info *sp;
@@ -219,7 +219,7 @@ err_out:
219 return err; 219 return err;
220} 220}
221 221
222static void __devexit s3d_pci_unregister(struct pci_dev *pdev) 222static void s3d_pci_unregister(struct pci_dev *pdev)
223{ 223{
224 struct fb_info *info = pci_get_drvdata(pdev); 224 struct fb_info *info = pci_get_drvdata(pdev);
225 struct s3d_info *sp = info->par; 225 struct s3d_info *sp = info->par;
@@ -251,7 +251,7 @@ static struct pci_driver s3d_driver = {
251 .name = "s3d", 251 .name = "s3d",
252 .id_table = s3d_pci_table, 252 .id_table = s3d_pci_table,
253 .probe = s3d_pci_register, 253 .probe = s3d_pci_register,
254 .remove = __devexit_p(s3d_pci_unregister), 254 .remove = s3d_pci_unregister,
255}; 255};
256 256
257static int __init s3d_init(void) 257static int __init s3d_init(void)
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
index 6c71b1b44477..387350d004df 100644
--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -51,7 +51,7 @@ struct e3d_info {
51 u32 pseudo_palette[16]; 51 u32 pseudo_palette[16];
52}; 52};
53 53
54static int __devinit e3d_get_props(struct e3d_info *ep) 54static int e3d_get_props(struct e3d_info *ep)
55{ 55{
56 ep->width = of_getintprop_default(ep->of_node, "width", 0); 56 ep->width = of_getintprop_default(ep->of_node, "width", 0);
57 ep->height = of_getintprop_default(ep->of_node, "height", 0); 57 ep->height = of_getintprop_default(ep->of_node, "height", 0);
@@ -193,7 +193,7 @@ static struct fb_ops e3d_ops = {
193 .fb_imageblit = e3d_imageblit, 193 .fb_imageblit = e3d_imageblit,
194}; 194};
195 195
196static int __devinit e3d_set_fbinfo(struct e3d_info *ep) 196static int e3d_set_fbinfo(struct e3d_info *ep)
197{ 197{
198 struct fb_info *info = ep->info; 198 struct fb_info *info = ep->info;
199 struct fb_var_screeninfo *var = &info->var; 199 struct fb_var_screeninfo *var = &info->var;
@@ -238,8 +238,8 @@ static int __devinit e3d_set_fbinfo(struct e3d_info *ep)
238 return 0; 238 return 0;
239} 239}
240 240
241static int __devinit e3d_pci_register(struct pci_dev *pdev, 241static int e3d_pci_register(struct pci_dev *pdev,
242 const struct pci_device_id *ent) 242 const struct pci_device_id *ent)
243{ 243{
244 struct device_node *of_node; 244 struct device_node *of_node;
245 const char *device_type; 245 const char *device_type;
@@ -392,7 +392,7 @@ err_out:
392 return err; 392 return err;
393} 393}
394 394
395static void __devexit e3d_pci_unregister(struct pci_dev *pdev) 395static void e3d_pci_unregister(struct pci_dev *pdev)
396{ 396{
397 struct fb_info *info = pci_get_drvdata(pdev); 397 struct fb_info *info = pci_get_drvdata(pdev);
398 struct e3d_info *ep = info->par; 398 struct e3d_info *ep = info->par;
@@ -437,7 +437,7 @@ static struct pci_driver e3d_driver = {
437 .name = "e3d", 437 .name = "e3d",
438 .id_table = e3d_pci_table, 438 .id_table = e3d_pci_table,
439 .probe = e3d_pci_register, 439 .probe = e3d_pci_register,
440 .remove = __devexit_p(e3d_pci_unregister), 440 .remove = e3d_pci_unregister,
441}; 441};
442 442
443static int __init e3d_init(void) 443static int __init e3d_init(void)
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 07c66e946634..c000852500aa 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -362,7 +362,7 @@ static void tcx_unmap_regs(struct platform_device *op, struct fb_info *info,
362 info->screen_base, info->fix.smem_len); 362 info->screen_base, info->fix.smem_len);
363} 363}
364 364
365static int __devinit tcx_probe(struct platform_device *op) 365static int tcx_probe(struct platform_device *op)
366{ 366{
367 struct device_node *dp = op->dev.of_node; 367 struct device_node *dp = op->dev.of_node;
368 struct fb_info *info; 368 struct fb_info *info;
@@ -486,7 +486,7 @@ out_err:
486 return err; 486 return err;
487} 487}
488 488
489static int __devexit tcx_remove(struct platform_device *op) 489static int tcx_remove(struct platform_device *op)
490{ 490{
491 struct fb_info *info = dev_get_drvdata(&op->dev); 491 struct fb_info *info = dev_get_drvdata(&op->dev);
492 struct tcx_par *par = info->par; 492 struct tcx_par *par = info->par;
@@ -518,7 +518,7 @@ static struct platform_driver tcx_driver = {
518 .of_match_table = tcx_match, 518 .of_match_table = tcx_match,
519 }, 519 },
520 .probe = tcx_probe, 520 .probe = tcx_probe,
521 .remove = __devexit_p(tcx_remove), 521 .remove = tcx_remove,
522}; 522};
523 523
524static int __init tcx_init(void) 524static int __init tcx_init(void)
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index e026724a3a56..64bc28ba4037 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -100,7 +100,7 @@ static inline int mtrr_del(int reg, unsigned long base,
100#define VOODOO3_MAX_PIXCLOCK 300000 100#define VOODOO3_MAX_PIXCLOCK 300000
101#define VOODOO5_MAX_PIXCLOCK 350000 101#define VOODOO5_MAX_PIXCLOCK 350000
102 102
103static struct fb_fix_screeninfo tdfx_fix __devinitdata = { 103static struct fb_fix_screeninfo tdfx_fix = {
104 .type = FB_TYPE_PACKED_PIXELS, 104 .type = FB_TYPE_PACKED_PIXELS,
105 .visual = FB_VISUAL_PSEUDOCOLOR, 105 .visual = FB_VISUAL_PSEUDOCOLOR,
106 .ypanstep = 1, 106 .ypanstep = 1,
@@ -108,7 +108,7 @@ static struct fb_fix_screeninfo tdfx_fix __devinitdata = {
108 .accel = FB_ACCEL_3DFX_BANSHEE 108 .accel = FB_ACCEL_3DFX_BANSHEE
109}; 109};
110 110
111static struct fb_var_screeninfo tdfx_var __devinitdata = { 111static struct fb_var_screeninfo tdfx_var = {
112 /* "640x480, 8 bpp @ 60 Hz */ 112 /* "640x480, 8 bpp @ 60 Hz */
113 .xres = 640, 113 .xres = 640,
114 .yres = 480, 114 .yres = 480,
@@ -135,9 +135,8 @@ static struct fb_var_screeninfo tdfx_var __devinitdata = {
135/* 135/*
136 * PCI driver prototypes 136 * PCI driver prototypes
137 */ 137 */
138static int __devinit tdfxfb_probe(struct pci_dev *pdev, 138static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id);
139 const struct pci_device_id *id); 139static void tdfxfb_remove(struct pci_dev *pdev);
140static void __devexit tdfxfb_remove(struct pci_dev *pdev);
141 140
142static struct pci_device_id tdfxfb_id_table[] = { 141static struct pci_device_id tdfxfb_id_table[] = {
143 { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_BANSHEE, 142 { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_BANSHEE,
@@ -156,7 +155,7 @@ static struct pci_driver tdfxfb_driver = {
156 .name = "tdfxfb", 155 .name = "tdfxfb",
157 .id_table = tdfxfb_id_table, 156 .id_table = tdfxfb_id_table,
158 .probe = tdfxfb_probe, 157 .probe = tdfxfb_probe,
159 .remove = __devexit_p(tdfxfb_remove), 158 .remove = tdfxfb_remove,
160}; 159};
161 160
162MODULE_DEVICE_TABLE(pci, tdfxfb_id_table); 161MODULE_DEVICE_TABLE(pci, tdfxfb_id_table);
@@ -167,9 +166,9 @@ MODULE_DEVICE_TABLE(pci, tdfxfb_id_table);
167static int nopan; 166static int nopan;
168static int nowrap = 1; /* not implemented (yet) */ 167static int nowrap = 1; /* not implemented (yet) */
169static int hwcursor = 1; 168static int hwcursor = 1;
170static char *mode_option __devinitdata; 169static char *mode_option;
171/* mtrr option */ 170/* mtrr option */
172static bool nomtrr __devinitdata; 171static bool nomtrr;
173 172
174/* ------------------------------------------------------------------------- 173/* -------------------------------------------------------------------------
175 * Hardware-specific funcions 174 * Hardware-specific funcions
@@ -1279,8 +1278,8 @@ static int tdfxfb_ddc_getsda(void *data)
1279 return (0 != (tdfx_inl(par, VIDSERPARPORT) & DDC_SDA_IN)); 1278 return (0 != (tdfx_inl(par, VIDSERPARPORT) & DDC_SDA_IN));
1280} 1279}
1281 1280
1282static int __devinit tdfxfb_setup_ddc_bus(struct tdfxfb_i2c_chan *chan, 1281static int tdfxfb_setup_ddc_bus(struct tdfxfb_i2c_chan *chan, const char *name,
1283 const char *name, struct device *dev) 1282 struct device *dev)
1284{ 1283{
1285 int rc; 1284 int rc;
1286 1285
@@ -1308,8 +1307,8 @@ static int __devinit tdfxfb_setup_ddc_bus(struct tdfxfb_i2c_chan *chan,
1308 return rc; 1307 return rc;
1309} 1308}
1310 1309
1311static int __devinit tdfxfb_setup_i2c_bus(struct tdfxfb_i2c_chan *chan, 1310static int tdfxfb_setup_i2c_bus(struct tdfxfb_i2c_chan *chan, const char *name,
1312 const char *name, struct device *dev) 1311 struct device *dev)
1313{ 1312{
1314 int rc; 1313 int rc;
1315 1314
@@ -1336,7 +1335,7 @@ static int __devinit tdfxfb_setup_i2c_bus(struct tdfxfb_i2c_chan *chan,
1336 return rc; 1335 return rc;
1337} 1336}
1338 1337
1339static void __devinit tdfxfb_create_i2c_busses(struct fb_info *info) 1338static void tdfxfb_create_i2c_busses(struct fb_info *info)
1340{ 1339{
1341 struct tdfx_par *par = info->par; 1340 struct tdfx_par *par = info->par;
1342 1341
@@ -1388,8 +1387,7 @@ static int tdfxfb_probe_i2c_connector(struct tdfx_par *par,
1388 * Initializes and allocates resources for PCI device @pdev. 1387 * Initializes and allocates resources for PCI device @pdev.
1389 * 1388 *
1390 */ 1389 */
1391static int __devinit tdfxfb_probe(struct pci_dev *pdev, 1390static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1392 const struct pci_device_id *id)
1393{ 1391{
1394 struct tdfx_par *default_par; 1392 struct tdfx_par *default_par;
1395 struct fb_info *info; 1393 struct fb_info *info;
@@ -1626,7 +1624,7 @@ static void __init tdfxfb_setup(char *options)
1626 * lifetime for the PCI device @pdev. 1624 * lifetime for the PCI device @pdev.
1627 * 1625 *
1628 */ 1626 */
1629static void __devexit tdfxfb_remove(struct pci_dev *pdev) 1627static void tdfxfb_remove(struct pci_dev *pdev)
1630{ 1628{
1631 struct fb_info *info = pci_get_drvdata(pdev); 1629 struct fb_info *info = pci_get_drvdata(pdev);
1632 struct tdfx_par *par = info->par; 1630 struct tdfx_par *par = info->par;
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index aba7686b1a32..c9c8e5a1fdee 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -61,8 +61,8 @@ static void tgafb_fillrect(struct fb_info *, const struct fb_fillrect *);
61static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *); 61static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);
62static int tgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); 62static int tgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);
63 63
64static int __devinit tgafb_register(struct device *dev); 64static int tgafb_register(struct device *dev);
65static void __devexit tgafb_unregister(struct device *dev); 65static void tgafb_unregister(struct device *dev);
66 66
67static const char *mode_option; 67static const char *mode_option;
68static const char *mode_option_pci = "640x480@60"; 68static const char *mode_option_pci = "640x480@60";
@@ -93,9 +93,8 @@ static struct fb_ops tgafb_ops = {
93/* 93/*
94 * PCI registration operations 94 * PCI registration operations
95 */ 95 */
96static int __devinit tgafb_pci_register(struct pci_dev *, 96static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);
97 const struct pci_device_id *); 97static void tgafb_pci_unregister(struct pci_dev *);
98static void __devexit tgafb_pci_unregister(struct pci_dev *);
99 98
100static struct pci_device_id const tgafb_pci_table[] = { 99static struct pci_device_id const tgafb_pci_table[] = {
101 { PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TGA) }, 100 { PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TGA) },
@@ -107,17 +106,16 @@ static struct pci_driver tgafb_pci_driver = {
107 .name = "tgafb", 106 .name = "tgafb",
108 .id_table = tgafb_pci_table, 107 .id_table = tgafb_pci_table,
109 .probe = tgafb_pci_register, 108 .probe = tgafb_pci_register,
110 .remove = __devexit_p(tgafb_pci_unregister), 109 .remove = tgafb_pci_unregister,
111}; 110};
112 111
113static int __devinit 112static int tgafb_pci_register(struct pci_dev *pdev,
114tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) 113 const struct pci_device_id *ent)
115{ 114{
116 return tgafb_register(&pdev->dev); 115 return tgafb_register(&pdev->dev);
117} 116}
118 117
119static void __devexit 118static void tgafb_pci_unregister(struct pci_dev *pdev)
120tgafb_pci_unregister(struct pci_dev *pdev)
121{ 119{
122 tgafb_unregister(&pdev->dev); 120 tgafb_unregister(&pdev->dev);
123} 121}
@@ -127,8 +125,8 @@ tgafb_pci_unregister(struct pci_dev *pdev)
127/* 125/*
128 * TC registration operations 126 * TC registration operations
129 */ 127 */
130static int __devinit tgafb_tc_register(struct device *); 128static int tgafb_tc_register(struct device *);
131static int __devexit tgafb_tc_unregister(struct device *); 129static int tgafb_tc_unregister(struct device *);
132 130
133static struct tc_device_id const tgafb_tc_table[] = { 131static struct tc_device_id const tgafb_tc_table[] = {
134 { "DEC ", "PMAGD-AA" }, 132 { "DEC ", "PMAGD-AA" },
@@ -143,12 +141,11 @@ static struct tc_driver tgafb_tc_driver = {
143 .name = "tgafb", 141 .name = "tgafb",
144 .bus = &tc_bus_type, 142 .bus = &tc_bus_type,
145 .probe = tgafb_tc_register, 143 .probe = tgafb_tc_register,
146 .remove = __devexit_p(tgafb_tc_unregister), 144 .remove = tgafb_tc_unregister,
147 }, 145 },
148}; 146};
149 147
150static int __devinit 148static int tgafb_tc_register(struct device *dev)
151tgafb_tc_register(struct device *dev)
152{ 149{
153 int status = tgafb_register(dev); 150 int status = tgafb_register(dev);
154 if (!status) 151 if (!status)
@@ -156,8 +153,7 @@ tgafb_tc_register(struct device *dev)
156 return status; 153 return status;
157} 154}
158 155
159static int __devexit 156static int tgafb_tc_unregister(struct device *dev)
160tgafb_tc_unregister(struct device *dev)
161{ 157{
162 put_device(dev); 158 put_device(dev);
163 tgafb_unregister(dev); 159 tgafb_unregister(dev);
@@ -1546,8 +1542,7 @@ static int tgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info
1546 return 0; 1542 return 0;
1547} 1543}
1548 1544
1549static int __devinit 1545static int tgafb_register(struct device *dev)
1550tgafb_register(struct device *dev)
1551{ 1546{
1552 static const struct fb_videomode modedb_tc = { 1547 static const struct fb_videomode modedb_tc = {
1553 /* 1280x1024 @ 72 Hz, 76.8 kHz hsync */ 1548 /* 1280x1024 @ 72 Hz, 76.8 kHz hsync */
@@ -1692,8 +1687,7 @@ tgafb_register(struct device *dev)
1692 return ret; 1687 return ret;
1693} 1688}
1694 1689
1695static void __devexit 1690static void tgafb_unregister(struct device *dev)
1696tgafb_unregister(struct device *dev)
1697{ 1691{
1698 resource_size_t bar0_start = 0, bar0_len = 0; 1692 resource_size_t bar0_start = 0, bar0_len = 0;
1699 int tga_bus_pci = TGA_BUS_PCI(dev); 1693 int tga_bus_pci = TGA_BUS_PCI(dev);
@@ -1721,16 +1715,14 @@ tgafb_unregister(struct device *dev)
1721 framebuffer_release(info); 1715 framebuffer_release(info);
1722} 1716}
1723 1717
1724static void __devexit 1718static void tgafb_exit(void)
1725tgafb_exit(void)
1726{ 1719{
1727 tc_unregister_driver(&tgafb_tc_driver); 1720 tc_unregister_driver(&tgafb_tc_driver);
1728 pci_unregister_driver(&tgafb_pci_driver); 1721 pci_unregister_driver(&tgafb_pci_driver);
1729} 1722}
1730 1723
1731#ifndef MODULE 1724#ifndef MODULE
1732static int __devinit 1725static int tgafb_setup(char *arg)
1733tgafb_setup(char *arg)
1734{ 1726{
1735 char *this_opt; 1727 char *this_opt;
1736 1728
@@ -1751,8 +1743,7 @@ tgafb_setup(char *arg)
1751} 1743}
1752#endif /* !MODULE */ 1744#endif /* !MODULE */
1753 1745
1754static int __devinit 1746static int tgafb_init(void)
1755tgafb_init(void)
1756{ 1747{
1757 int status; 1748 int status;
1758#ifndef MODULE 1749#ifndef MODULE
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index b244f060f151..dc4fb8620156 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -191,7 +191,7 @@
191#define LCR_VCLKHW 0x1b4 /* VCLK High Width */ 191#define LCR_VCLKHW 0x1b4 /* VCLK High Width */
192#define LCR_OC 0x1b6 /* Output Control */ 192#define LCR_OC 0x1b6 /* Output Control */
193 193
194static char *mode_option __devinitdata; 194static char *mode_option;
195 195
196struct tmiofb_par { 196struct tmiofb_par {
197 u32 pseudo_palette[16]; 197 u32 pseudo_palette[16];
@@ -675,7 +675,7 @@ static struct fb_ops tmiofb_ops = {
675 675
676/*--------------------------------------------------------------------------*/ 676/*--------------------------------------------------------------------------*/
677 677
678static int __devinit tmiofb_probe(struct platform_device *dev) 678static int tmiofb_probe(struct platform_device *dev)
679{ 679{
680 const struct mfd_cell *cell = mfd_get_cell(dev); 680 const struct mfd_cell *cell = mfd_get_cell(dev);
681 struct tmio_fb_data *data = dev->dev.platform_data; 681 struct tmio_fb_data *data = dev->dev.platform_data;
@@ -807,7 +807,7 @@ err_ioremap_ccr:
807 return retval; 807 return retval;
808} 808}
809 809
810static int __devexit tmiofb_remove(struct platform_device *dev) 810static int tmiofb_remove(struct platform_device *dev)
811{ 811{
812 const struct mfd_cell *cell = mfd_get_cell(dev); 812 const struct mfd_cell *cell = mfd_get_cell(dev);
813 struct fb_info *info = platform_get_drvdata(dev); 813 struct fb_info *info = platform_get_drvdata(dev);
@@ -1002,7 +1002,7 @@ static struct platform_driver tmiofb_driver = {
1002 .driver.name = "tmio-fb", 1002 .driver.name = "tmio-fb",
1003 .driver.owner = THIS_MODULE, 1003 .driver.owner = THIS_MODULE,
1004 .probe = tmiofb_probe, 1004 .probe = tmiofb_probe,
1005 .remove = __devexit_p(tmiofb_remove), 1005 .remove = tmiofb_remove,
1006 .suspend = tmiofb_suspend, 1006 .suspend = tmiofb_suspend,
1007 .resume = tmiofb_resume, 1007 .resume = tmiofb_resume,
1008}; 1008};
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 34cf019bba44..ab57d387d6b5 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -53,19 +53,19 @@ static struct fb_fix_screeninfo tridentfb_fix = {
53/* defaults which are normally overriden by user values */ 53/* defaults which are normally overriden by user values */
54 54
55/* video mode */ 55/* video mode */
56static char *mode_option __devinitdata = "640x480-8@60"; 56static char *mode_option = "640x480-8@60";
57static int bpp __devinitdata = 8; 57static int bpp = 8;
58 58
59static int noaccel __devinitdata; 59static int noaccel;
60 60
61static int center; 61static int center;
62static int stretch; 62static int stretch;
63 63
64static int fp __devinitdata; 64static int fp;
65static int crt __devinitdata; 65static int crt;
66 66
67static int memsize __devinitdata; 67static int memsize;
68static int memdiff __devinitdata; 68static int memdiff;
69static int nativex; 69static int nativex;
70 70
71module_param(mode_option, charp, 0); 71module_param(mode_option, charp, 0);
@@ -637,7 +637,7 @@ static inline void crtc_unlock(struct tridentfb_par *par)
637} 637}
638 638
639/* Return flat panel's maximum x resolution */ 639/* Return flat panel's maximum x resolution */
640static int __devinit get_nativex(struct tridentfb_par *par) 640static int get_nativex(struct tridentfb_par *par)
641{ 641{
642 int x, y, tmp; 642 int x, y, tmp;
643 643
@@ -771,7 +771,7 @@ static void set_number_of_lines(struct tridentfb_par *par, int lines)
771 * If we see that FP is active we assume we have one. 771 * If we see that FP is active we assume we have one.
772 * Otherwise we have a CRT display. User can override. 772 * Otherwise we have a CRT display. User can override.
773 */ 773 */
774static int __devinit is_flatpanel(struct tridentfb_par *par) 774static int is_flatpanel(struct tridentfb_par *par)
775{ 775{
776 if (fp) 776 if (fp)
777 return 1; 777 return 1;
@@ -781,7 +781,7 @@ static int __devinit is_flatpanel(struct tridentfb_par *par)
781} 781}
782 782
783/* Try detecting the video memory size */ 783/* Try detecting the video memory size */
784static unsigned int __devinit get_memsize(struct tridentfb_par *par) 784static unsigned int get_memsize(struct tridentfb_par *par)
785{ 785{
786 unsigned char tmp, tmp2; 786 unsigned char tmp, tmp2;
787 unsigned int k; 787 unsigned int k;
@@ -1331,8 +1331,8 @@ static struct fb_ops tridentfb_ops = {
1331 .fb_sync = tridentfb_sync, 1331 .fb_sync = tridentfb_sync,
1332}; 1332};
1333 1333
1334static int __devinit trident_pci_probe(struct pci_dev *dev, 1334static int trident_pci_probe(struct pci_dev *dev,
1335 const struct pci_device_id *id) 1335 const struct pci_device_id *id)
1336{ 1336{
1337 int err; 1337 int err;
1338 unsigned char revision; 1338 unsigned char revision;
@@ -1543,7 +1543,7 @@ out_unmap1:
1543 return err; 1543 return err;
1544} 1544}
1545 1545
1546static void __devexit trident_pci_remove(struct pci_dev *dev) 1546static void trident_pci_remove(struct pci_dev *dev)
1547{ 1547{
1548 struct fb_info *info = pci_get_drvdata(dev); 1548 struct fb_info *info = pci_get_drvdata(dev);
1549 struct tridentfb_par *par = info->par; 1549 struct tridentfb_par *par = info->par;
@@ -1591,7 +1591,7 @@ static struct pci_driver tridentfb_pci_driver = {
1591 .name = "tridentfb", 1591 .name = "tridentfb",
1592 .id_table = trident_devices, 1592 .id_table = trident_devices,
1593 .probe = trident_pci_probe, 1593 .probe = trident_pci_probe,
1594 .remove = __devexit_p(trident_pci_remove) 1594 .remove = trident_pci_remove,
1595}; 1595};
1596 1596
1597/* 1597/*
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 2f8f82d874a1..b75db0186488 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -36,26 +36,26 @@ static struct cb_id uvesafb_cn_id = {
36static char v86d_path[PATH_MAX] = "/sbin/v86d"; 36static char v86d_path[PATH_MAX] = "/sbin/v86d";
37static char v86d_started; /* has v86d been started by uvesafb? */ 37static char v86d_started; /* has v86d been started by uvesafb? */
38 38
39static struct fb_fix_screeninfo uvesafb_fix __devinitdata = { 39static struct fb_fix_screeninfo uvesafb_fix = {
40 .id = "VESA VGA", 40 .id = "VESA VGA",
41 .type = FB_TYPE_PACKED_PIXELS, 41 .type = FB_TYPE_PACKED_PIXELS,
42 .accel = FB_ACCEL_NONE, 42 .accel = FB_ACCEL_NONE,
43 .visual = FB_VISUAL_TRUECOLOR, 43 .visual = FB_VISUAL_TRUECOLOR,
44}; 44};
45 45
46static int mtrr __devinitdata = 3; /* enable mtrr by default */ 46static int mtrr = 3; /* enable mtrr by default */
47static bool blank = 1; /* enable blanking by default */ 47static bool blank = 1; /* enable blanking by default */
48static int ypan = 1; /* 0: scroll, 1: ypan, 2: ywrap */ 48static int ypan = 1; /* 0: scroll, 1: ypan, 2: ywrap */
49static bool pmi_setpal __devinitdata = true; /* use PMI for palette changes */ 49static bool pmi_setpal = true; /* use PMI for palette changes */
50static bool nocrtc __devinitdata; /* ignore CRTC settings */ 50static bool nocrtc; /* ignore CRTC settings */
51static bool noedid __devinitdata; /* don't try DDC transfers */ 51static bool noedid; /* don't try DDC transfers */
52static int vram_remap __devinitdata; /* set amt. of memory to be used */ 52static int vram_remap; /* set amt. of memory to be used */
53static int vram_total __devinitdata; /* set total amount of memory */ 53static int vram_total; /* set total amount of memory */
54static u16 maxclk __devinitdata; /* maximum pixel clock */ 54static u16 maxclk; /* maximum pixel clock */
55static u16 maxvf __devinitdata; /* maximum vertical frequency */ 55static u16 maxvf; /* maximum vertical frequency */
56static u16 maxhf __devinitdata; /* maximum horizontal frequency */ 56static u16 maxhf; /* maximum horizontal frequency */
57static u16 vbemode __devinitdata; /* force use of a specific VBE mode */ 57static u16 vbemode; /* force use of a specific VBE mode */
58static char *mode_option __devinitdata; 58static char *mode_option;
59static u8 dac_width = 6; 59static u8 dac_width = 6;
60 60
61static struct uvesafb_ktask *uvfb_tasks[UVESAFB_TASKS_MAX]; 61static struct uvesafb_ktask *uvfb_tasks[UVESAFB_TASKS_MAX];
@@ -418,8 +418,8 @@ static void uvesafb_vbe_state_restore(struct uvesafb_par *par, u8 *state_buf)
418 uvesafb_free(task); 418 uvesafb_free(task);
419} 419}
420 420
421static int __devinit uvesafb_vbe_getinfo(struct uvesafb_ktask *task, 421static int uvesafb_vbe_getinfo(struct uvesafb_ktask *task,
422 struct uvesafb_par *par) 422 struct uvesafb_par *par)
423{ 423{
424 int err; 424 int err;
425 425
@@ -477,8 +477,8 @@ static int __devinit uvesafb_vbe_getinfo(struct uvesafb_ktask *task,
477 return 0; 477 return 0;
478} 478}
479 479
480static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task, 480static int uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
481 struct uvesafb_par *par) 481 struct uvesafb_par *par)
482{ 482{
483 int off = 0, err; 483 int off = 0, err;
484 u16 *mode; 484 u16 *mode;
@@ -556,8 +556,8 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
556 * x86 and not x86_64. 556 * x86 and not x86_64.
557 */ 557 */
558#ifdef CONFIG_X86_32 558#ifdef CONFIG_X86_32
559static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task, 559static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
560 struct uvesafb_par *par) 560 struct uvesafb_par *par)
561{ 561{
562 int i, err; 562 int i, err;
563 563
@@ -602,8 +602,8 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
602 * Check whether a video mode is supported by the Video BIOS and is 602 * Check whether a video mode is supported by the Video BIOS and is
603 * compatible with the monitor limits. 603 * compatible with the monitor limits.
604 */ 604 */
605static int __devinit uvesafb_is_valid_mode(struct fb_videomode *mode, 605static int uvesafb_is_valid_mode(struct fb_videomode *mode,
606 struct fb_info *info) 606 struct fb_info *info)
607{ 607{
608 if (info->monspecs.gtf) { 608 if (info->monspecs.gtf) {
609 fb_videomode_to_var(&info->var, mode); 609 fb_videomode_to_var(&info->var, mode);
@@ -618,8 +618,7 @@ static int __devinit uvesafb_is_valid_mode(struct fb_videomode *mode,
618 return 1; 618 return 1;
619} 619}
620 620
621static int __devinit uvesafb_vbe_getedid(struct uvesafb_ktask *task, 621static int uvesafb_vbe_getedid(struct uvesafb_ktask *task, struct fb_info *info)
622 struct fb_info *info)
623{ 622{
624 struct uvesafb_par *par = info->par; 623 struct uvesafb_par *par = info->par;
625 int err = 0; 624 int err = 0;
@@ -684,8 +683,8 @@ static int __devinit uvesafb_vbe_getedid(struct uvesafb_ktask *task,
684 return err; 683 return err;
685} 684}
686 685
687static void __devinit uvesafb_vbe_getmonspecs(struct uvesafb_ktask *task, 686static void uvesafb_vbe_getmonspecs(struct uvesafb_ktask *task,
688 struct fb_info *info) 687 struct fb_info *info)
689{ 688{
690 struct uvesafb_par *par = info->par; 689 struct uvesafb_par *par = info->par;
691 int i; 690 int i;
@@ -765,8 +764,8 @@ static void __devinit uvesafb_vbe_getmonspecs(struct uvesafb_ktask *task,
765 return; 764 return;
766} 765}
767 766
768static void __devinit uvesafb_vbe_getstatesize(struct uvesafb_ktask *task, 767static void uvesafb_vbe_getstatesize(struct uvesafb_ktask *task,
769 struct uvesafb_par *par) 768 struct uvesafb_par *par)
770{ 769{
771 int err; 770 int err;
772 771
@@ -794,7 +793,7 @@ static void __devinit uvesafb_vbe_getstatesize(struct uvesafb_ktask *task,
794 par->vbe_state_size = 64 * (task->t.regs.ebx & 0xffff); 793 par->vbe_state_size = 64 * (task->t.regs.ebx & 0xffff);
795} 794}
796 795
797static int __devinit uvesafb_vbe_init(struct fb_info *info) 796static int uvesafb_vbe_init(struct fb_info *info)
798{ 797{
799 struct uvesafb_ktask *task = NULL; 798 struct uvesafb_ktask *task = NULL;
800 struct uvesafb_par *par = info->par; 799 struct uvesafb_par *par = info->par;
@@ -839,7 +838,7 @@ out: uvesafb_free(task);
839 return err; 838 return err;
840} 839}
841 840
842static int __devinit uvesafb_vbe_init_mode(struct fb_info *info) 841static int uvesafb_vbe_init_mode(struct fb_info *info)
843{ 842{
844 struct list_head *pos; 843 struct list_head *pos;
845 struct fb_modelist *modelist; 844 struct fb_modelist *modelist;
@@ -1444,8 +1443,7 @@ static struct fb_ops uvesafb_ops = {
1444 .fb_set_par = uvesafb_set_par, 1443 .fb_set_par = uvesafb_set_par,
1445}; 1444};
1446 1445
1447static void __devinit uvesafb_init_info(struct fb_info *info, 1446static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
1448 struct vbe_mode_ib *mode)
1449{ 1447{
1450 unsigned int size_vmode; 1448 unsigned int size_vmode;
1451 unsigned int size_remap; 1449 unsigned int size_remap;
@@ -1540,7 +1538,7 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
1540 info->fbops->fb_pan_display = NULL; 1538 info->fbops->fb_pan_display = NULL;
1541} 1539}
1542 1540
1543static void __devinit uvesafb_init_mtrr(struct fb_info *info) 1541static void uvesafb_init_mtrr(struct fb_info *info)
1544{ 1542{
1545#ifdef CONFIG_MTRR 1543#ifdef CONFIG_MTRR
1546 if (mtrr && !(info->fix.smem_start & (PAGE_SIZE - 1))) { 1544 if (mtrr && !(info->fix.smem_start & (PAGE_SIZE - 1))) {
@@ -1582,7 +1580,7 @@ static void __devinit uvesafb_init_mtrr(struct fb_info *info)
1582#endif /* CONFIG_MTRR */ 1580#endif /* CONFIG_MTRR */
1583} 1581}
1584 1582
1585static void __devinit uvesafb_ioremap(struct fb_info *info) 1583static void uvesafb_ioremap(struct fb_info *info)
1586{ 1584{
1587#ifdef CONFIG_X86 1585#ifdef CONFIG_X86
1588 switch (mtrr) { 1586 switch (mtrr) {
@@ -1738,7 +1736,7 @@ static struct attribute_group uvesafb_dev_attgrp = {
1738 .attrs = uvesafb_dev_attrs, 1736 .attrs = uvesafb_dev_attrs,
1739}; 1737};
1740 1738
1741static int __devinit uvesafb_probe(struct platform_device *dev) 1739static int uvesafb_probe(struct platform_device *dev)
1742{ 1740{
1743 struct fb_info *info; 1741 struct fb_info *info;
1744 struct vbe_mode_ib *mode = NULL; 1742 struct vbe_mode_ib *mode = NULL;
@@ -1882,7 +1880,7 @@ static struct platform_driver uvesafb_driver = {
1882static struct platform_device *uvesafb_device; 1880static struct platform_device *uvesafb_device;
1883 1881
1884#ifndef MODULE 1882#ifndef MODULE
1885static int __devinit uvesafb_setup(char *options) 1883static int uvesafb_setup(char *options)
1886{ 1884{
1887 char *this_opt; 1885 char *this_opt;
1888 1886
@@ -1950,7 +1948,7 @@ static ssize_t store_v86d(struct device_driver *dev, const char *buf,
1950 1948
1951static DRIVER_ATTR(v86d, S_IRUGO | S_IWUSR, show_v86d, store_v86d); 1949static DRIVER_ATTR(v86d, S_IRUGO | S_IWUSR, show_v86d, store_v86d);
1952 1950
1953static int __devinit uvesafb_init(void) 1951static int uvesafb_init(void)
1954{ 1952{
1955 int err; 1953 int err;
1956 1954
@@ -1994,7 +1992,7 @@ static int __devinit uvesafb_init(void)
1994 1992
1995module_init(uvesafb_init); 1993module_init(uvesafb_init);
1996 1994
1997static void __devexit uvesafb_exit(void) 1995static void uvesafb_exit(void)
1998{ 1996{
1999 struct uvesafb_ktask *task; 1997 struct uvesafb_ktask *task;
2000 1998
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index 4709edc3cb7f..0aa516fc59cd 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -393,7 +393,7 @@ static void vmlfb_release_devices(struct vml_par *par)
393 * Free up allocated resources for a device. 393 * Free up allocated resources for a device.
394 */ 394 */
395 395
396static void __devexit vml_pci_remove(struct pci_dev *dev) 396static void vml_pci_remove(struct pci_dev *dev)
397{ 397{
398 struct fb_info *info; 398 struct fb_info *info;
399 struct vml_info *vinfo; 399 struct vml_info *vinfo;
@@ -452,8 +452,7 @@ static void vmlfb_set_pref_pixel_format(struct fb_var_screeninfo *var)
452 * struct per pipe. Currently we have only one pipe. 452 * struct per pipe. Currently we have only one pipe.
453 */ 453 */
454 454
455static int __devinit vml_pci_probe(struct pci_dev *dev, 455static int vml_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
456 const struct pci_device_id *id)
457{ 456{
458 struct vml_info *vinfo; 457 struct vml_info *vinfo;
459 struct fb_info *info; 458 struct fb_info *info;
@@ -1060,7 +1059,7 @@ static struct pci_driver vmlfb_pci_driver = {
1060 .name = "vmlfb", 1059 .name = "vmlfb",
1061 .id_table = vml_ids, 1060 .id_table = vml_ids,
1062 .probe = vml_pci_probe, 1061 .probe = vml_pci_probe,
1063 .remove = __devexit_p(vml_pci_remove) 1062 .remove = vml_pci_remove,
1064}; 1063};
1065 1064
1066static void __exit vmlfb_cleanup(void) 1065static void __exit vmlfb_cleanup(void)
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index c7f692525b88..8bc1f9398945 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -78,7 +78,7 @@ static void rvfree(void *mem, unsigned long size)
78 vfree(mem); 78 vfree(mem);
79} 79}
80 80
81static struct fb_var_screeninfo vfb_default __devinitdata = { 81static struct fb_var_screeninfo vfb_default = {
82 .xres = 640, 82 .xres = 640,
83 .yres = 480, 83 .yres = 480,
84 .xres_virtual = 640, 84 .xres_virtual = 640,
@@ -100,7 +100,7 @@ static struct fb_var_screeninfo vfb_default __devinitdata = {
100 .vmode = FB_VMODE_NONINTERLACED, 100 .vmode = FB_VMODE_NONINTERLACED,
101}; 101};
102 102
103static struct fb_fix_screeninfo vfb_fix __devinitdata = { 103static struct fb_fix_screeninfo vfb_fix = {
104 .id = "Virtual FB", 104 .id = "Virtual FB",
105 .type = FB_TYPE_PACKED_PIXELS, 105 .type = FB_TYPE_PACKED_PIXELS,
106 .visual = FB_VISUAL_PSEUDOCOLOR, 106 .visual = FB_VISUAL_PSEUDOCOLOR,
@@ -477,7 +477,7 @@ static int __init vfb_setup(char *options)
477 * Initialisation 477 * Initialisation
478 */ 478 */
479 479
480static int __devinit vfb_probe(struct platform_device *dev) 480static int vfb_probe(struct platform_device *dev)
481{ 481{
482 struct fb_info *info; 482 struct fb_info *info;
483 int retval = -ENOMEM; 483 int retval = -ENOMEM;
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 0267acd8dc83..545faeccdb44 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -65,7 +65,7 @@ struct vga16fb_par {
65 65
66/* --------------------------------------------------------------------- */ 66/* --------------------------------------------------------------------- */
67 67
68static struct fb_var_screeninfo vga16fb_defined __devinitdata = { 68static struct fb_var_screeninfo vga16fb_defined = {
69 .xres = 640, 69 .xres = 640,
70 .yres = 480, 70 .yres = 480,
71 .xres_virtual = 640, 71 .xres_virtual = 640,
@@ -85,7 +85,7 @@ static struct fb_var_screeninfo vga16fb_defined __devinitdata = {
85}; 85};
86 86
87/* name should not depend on EGA/VGA */ 87/* name should not depend on EGA/VGA */
88static struct fb_fix_screeninfo vga16fb_fix __devinitdata = { 88static struct fb_fix_screeninfo vga16fb_fix = {
89 .id = "VGA16 VGA", 89 .id = "VGA16 VGA",
90 .smem_start = VGA_FB_PHYS, 90 .smem_start = VGA_FB_PHYS,
91 .smem_len = VGA_FB_PHYS_LEN, 91 .smem_len = VGA_FB_PHYS_LEN,
@@ -1303,7 +1303,7 @@ static int __init vga16fb_setup(char *options)
1303} 1303}
1304#endif 1304#endif
1305 1305
1306static int __devinit vga16fb_probe(struct platform_device *dev) 1306static int vga16fb_probe(struct platform_device *dev)
1307{ 1307{
1308 struct fb_info *info; 1308 struct fb_info *info;
1309 struct vga16fb_par *par; 1309 struct vga16fb_par *par;
@@ -1395,7 +1395,7 @@ static int __devinit vga16fb_probe(struct platform_device *dev)
1395 return ret; 1395 return ret;
1396} 1396}
1397 1397
1398static int __devexit vga16fb_remove(struct platform_device *dev) 1398static int vga16fb_remove(struct platform_device *dev)
1399{ 1399{
1400 struct fb_info *info = platform_get_drvdata(dev); 1400 struct fb_info *info = platform_get_drvdata(dev);
1401 1401
@@ -1407,7 +1407,7 @@ static int __devexit vga16fb_remove(struct platform_device *dev)
1407 1407
1408static struct platform_driver vga16fb_driver = { 1408static struct platform_driver vga16fb_driver = {
1409 .probe = vga16fb_probe, 1409 .probe = vga16fb_probe,
1410 .remove = __devexit_p(vga16fb_remove), 1410 .remove = vga16fb_remove,
1411 .driver = { 1411 .driver = {
1412 .name = "vga16fb", 1412 .name = "vga16fb",
1413 }, 1413 },
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
index 6be72f0ba21d..7789553952d3 100644
--- a/drivers/video/via/dvi.c
+++ b/drivers/video/via/dvi.c
@@ -25,7 +25,7 @@
25static void tmds_register_write(int index, u8 data); 25static void tmds_register_write(int index, u8 data);
26static int tmds_register_read(int index); 26static int tmds_register_read(int index);
27static int tmds_register_read_bytes(int index, u8 *buff, int buff_len); 27static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);
28static void __devinit dvi_get_panel_size_from_DDCv1( 28static void dvi_get_panel_size_from_DDCv1(
29 struct tmds_chip_information *tmds_chip, 29 struct tmds_chip_information *tmds_chip,
30 struct tmds_setting_information *tmds_setting); 30 struct tmds_setting_information *tmds_setting);
31static int viafb_dvi_query_EDID(void); 31static int viafb_dvi_query_EDID(void);
@@ -35,8 +35,8 @@ static inline bool check_tmds_chip(int device_id_subaddr, int device_id)
35 return tmds_register_read(device_id_subaddr) == device_id; 35 return tmds_register_read(device_id_subaddr) == device_id;
36} 36}
37 37
38void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, 38void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
39 struct tmds_setting_information *tmds_setting) 39 struct tmds_setting_information *tmds_setting)
40{ 40{
41 DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n"); 41 DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");
42 42
@@ -47,7 +47,7 @@ void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
47 return; 47 return;
48} 48}
49 49
50bool __devinit viafb_tmds_trasmitter_identify(void) 50bool viafb_tmds_trasmitter_identify(void)
51{ 51{
52 unsigned char sr2a = 0, sr1e = 0, sr3e = 0; 52 unsigned char sr2a = 0, sr1e = 0, sr3e = 0;
53 53
@@ -285,7 +285,7 @@ static int viafb_dvi_query_EDID(void)
285} 285}
286 286
287/* Get Panel Size Using EDID1 Table */ 287/* Get Panel Size Using EDID1 Table */
288static void __devinit dvi_get_panel_size_from_DDCv1( 288static void dvi_get_panel_size_from_DDCv1(
289 struct tmds_chip_information *tmds_chip, 289 struct tmds_chip_information *tmds_chip,
290 struct tmds_setting_information *tmds_setting) 290 struct tmds_setting_information *tmds_setting)
291{ 291{
diff --git a/drivers/video/via/dvi.h b/drivers/video/via/dvi.h
index db757850c216..4c6bfba57d11 100644
--- a/drivers/video/via/dvi.h
+++ b/drivers/video/via/dvi.h
@@ -56,8 +56,8 @@
56int viafb_dvi_sense(void); 56int viafb_dvi_sense(void);
57void viafb_dvi_disable(void); 57void viafb_dvi_disable(void);
58void viafb_dvi_enable(void); 58void viafb_dvi_enable(void);
59bool __devinit viafb_tmds_trasmitter_identify(void); 59bool viafb_tmds_trasmitter_identify(void);
60void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, 60void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
61 struct tmds_setting_information *tmds_setting); 61 struct tmds_setting_information *tmds_setting);
62void viafb_dvi_set_mode(const struct fb_var_screeninfo *var, 62void viafb_dvi_set_mode(const struct fb_var_screeninfo *var,
63 u16 cxres, u16 cyres, int iga); 63 u16 cxres, u16 cyres, int iga);
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index 898590db5e14..80233dae358a 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -465,9 +465,9 @@ static struct via_device_mapping device_mapping[] = {
465static struct via_clock clock; 465static struct via_clock clock;
466 466
467static void load_fix_bit_crtc_reg(void); 467static void load_fix_bit_crtc_reg(void);
468static void __devinit init_gfx_chip_info(int chip_type); 468static void init_gfx_chip_info(int chip_type);
469static void __devinit init_tmds_chip_info(void); 469static void init_tmds_chip_info(void);
470static void __devinit init_lvds_chip_info(void); 470static void init_lvds_chip_info(void);
471static void device_screen_off(void); 471static void device_screen_off(void);
472static void device_screen_on(void); 472static void device_screen_on(void);
473static void set_display_channel(void); 473static void set_display_channel(void);
@@ -1507,7 +1507,7 @@ void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,
1507 viafb_set_vclock(PICOS2KHZ(var->pixclock) * 1000, iga); 1507 viafb_set_vclock(PICOS2KHZ(var->pixclock) * 1000, iga);
1508} 1508}
1509 1509
1510void __devinit viafb_init_chip_info(int chip_type) 1510void viafb_init_chip_info(int chip_type)
1511{ 1511{
1512 via_clock_init(&clock, chip_type); 1512 via_clock_init(&clock, chip_type);
1513 init_gfx_chip_info(chip_type); 1513 init_gfx_chip_info(chip_type);
@@ -1540,7 +1540,7 @@ void viafb_update_device_setting(int hres, int vres, int bpp, int flag)
1540 } 1540 }
1541} 1541}
1542 1542
1543static void __devinit init_gfx_chip_info(int chip_type) 1543static void init_gfx_chip_info(int chip_type)
1544{ 1544{
1545 u8 tmp; 1545 u8 tmp;
1546 1546
@@ -1593,7 +1593,7 @@ static void __devinit init_gfx_chip_info(int chip_type)
1593 } 1593 }
1594} 1594}
1595 1595
1596static void __devinit init_tmds_chip_info(void) 1596static void init_tmds_chip_info(void)
1597{ 1597{
1598 viafb_tmds_trasmitter_identify(); 1598 viafb_tmds_trasmitter_identify();
1599 1599
@@ -1638,7 +1638,7 @@ static void __devinit init_tmds_chip_info(void)
1638 &viaparinfo->shared->tmds_setting_info); 1638 &viaparinfo->shared->tmds_setting_info);
1639} 1639}
1640 1640
1641static void __devinit init_lvds_chip_info(void) 1641static void init_lvds_chip_info(void)
1642{ 1642{
1643 viafb_lvds_trasmitter_identify(); 1643 viafb_lvds_trasmitter_identify();
1644 viafb_init_lcd_size(); 1644 viafb_init_lcd_size();
@@ -1672,7 +1672,7 @@ static void __devinit init_lvds_chip_info(void)
1672 viaparinfo->chip_info->lvds_chip_info.output_interface); 1672 viaparinfo->chip_info->lvds_chip_info.output_interface);
1673} 1673}
1674 1674
1675void __devinit viafb_init_dac(int set_iga) 1675void viafb_init_dac(int set_iga)
1676{ 1676{
1677 int i; 1677 int i;
1678 u8 tmp; 1678 u8 tmp;
diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h
index 6be243cfc823..a8205754c736 100644
--- a/drivers/video/via/hw.h
+++ b/drivers/video/via/hw.h
@@ -663,8 +663,8 @@ void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
663int viafb_setmode(void); 663int viafb_setmode(void);
664void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, 664void viafb_fill_var_timing_info(struct fb_var_screeninfo *var,
665 const struct fb_videomode *mode); 665 const struct fb_videomode *mode);
666void __devinit viafb_init_chip_info(int chip_type); 666void viafb_init_chip_info(int chip_type);
667void __devinit viafb_init_dac(int set_iga); 667void viafb_init_dac(int set_iga);
668int viafb_get_refresh(int hres, int vres, u32 float_refresh); 668int viafb_get_refresh(int hres, int vres, u32 float_refresh);
669void viafb_update_device_setting(int hres, int vres, int bpp, int flag); 669void viafb_update_device_setting(int hres, int vres, int bpp, int flag);
670 670
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 165037910536..980ee1b1dcf3 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -49,7 +49,7 @@ static struct _lcd_scaling_factor lcd_scaling_factor_CLE = {
49}; 49};
50 50
51static bool lvds_identify_integratedlvds(void); 51static bool lvds_identify_integratedlvds(void);
52static void __devinit fp_id_to_vindex(int panel_id); 52static void fp_id_to_vindex(int panel_id);
53static int lvds_register_read(int index); 53static int lvds_register_read(int index);
54static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, 54static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
55 int panel_vres); 55 int panel_vres);
@@ -81,7 +81,7 @@ static inline bool check_lvds_chip(int device_id_subaddr, int device_id)
81 return lvds_register_read(device_id_subaddr) == device_id; 81 return lvds_register_read(device_id_subaddr) == device_id;
82} 82}
83 83
84void __devinit viafb_init_lcd_size(void) 84void viafb_init_lcd_size(void)
85{ 85{
86 DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n"); 86 DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");
87 87
@@ -139,7 +139,7 @@ static bool lvds_identify_integratedlvds(void)
139 return true; 139 return true;
140} 140}
141 141
142bool __devinit viafb_lvds_trasmitter_identify(void) 142bool viafb_lvds_trasmitter_identify(void)
143{ 143{
144 if (viafb_lvds_identify_vt1636(VIA_PORT_31)) { 144 if (viafb_lvds_identify_vt1636(VIA_PORT_31)) {
145 viaparinfo->chip_info->lvds_chip_info.i2c_port = VIA_PORT_31; 145 viaparinfo->chip_info->lvds_chip_info.i2c_port = VIA_PORT_31;
@@ -180,7 +180,7 @@ bool __devinit viafb_lvds_trasmitter_identify(void)
180 return false; 180 return false;
181} 181}
182 182
183static void __devinit fp_id_to_vindex(int panel_id) 183static void fp_id_to_vindex(int panel_id)
184{ 184{
185 DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n"); 185 DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n");
186 186
@@ -914,7 +914,7 @@ static void check_diport_of_integrated_lvds(
914 plvds_chip_info->output_interface); 914 plvds_chip_info->output_interface);
915} 915}
916 916
917void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information 917void viafb_init_lvds_output_interface(struct lvds_chip_information
918 *plvds_chip_info, 918 *plvds_chip_info,
919 struct lvds_setting_information 919 struct lvds_setting_information
920 *plvds_setting_info) 920 *plvds_setting_info)
diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h
index 8f3e4e06156c..5c988a063ad5 100644
--- a/drivers/video/via/lcd.h
+++ b/drivers/video/via/lcd.h
@@ -71,15 +71,15 @@ void viafb_enable_lvds_vt1636(struct lvds_setting_information
71 struct lvds_chip_information *plvds_chip_info); 71 struct lvds_chip_information *plvds_chip_info);
72void viafb_lcd_disable(void); 72void viafb_lcd_disable(void);
73void viafb_lcd_enable(void); 73void viafb_lcd_enable(void);
74void __devinit viafb_init_lcd_size(void); 74void viafb_init_lcd_size(void);
75void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information 75void viafb_init_lvds_output_interface(struct lvds_chip_information
76 *plvds_chip_info, 76 *plvds_chip_info,
77 struct lvds_setting_information 77 struct lvds_setting_information
78 *plvds_setting_info); 78 *plvds_setting_info);
79void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres, 79void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres,
80 u16 cyres, struct lvds_setting_information *plvds_setting_info, 80 u16 cyres, struct lvds_setting_information *plvds_setting_info,
81 struct lvds_chip_information *plvds_chip_info); 81 struct lvds_chip_information *plvds_chip_info);
82bool __devinit viafb_lvds_trasmitter_identify(void); 82bool viafb_lvds_trasmitter_identify(void);
83void viafb_init_lvds_output_interface(struct lvds_chip_information 83void viafb_init_lvds_output_interface(struct lvds_chip_information
84 *plvds_chip_info, 84 *plvds_chip_info,
85 struct lvds_setting_information 85 struct lvds_setting_information
diff --git a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c
index dd58b530c0df..6e274825fb31 100644
--- a/drivers/video/via/via-core.c
+++ b/drivers/video/via/via-core.c
@@ -80,7 +80,7 @@ static inline int viafb_mmio_read(int reg)
80 */ 80 */
81static u32 viafb_enabled_ints; 81static u32 viafb_enabled_ints;
82 82
83static void __devinit viafb_int_init(void) 83static void viafb_int_init(void)
84{ 84{
85 viafb_enabled_ints = 0; 85 viafb_enabled_ints = 0;
86 86
@@ -475,7 +475,7 @@ static int viafb_get_fb_size_from_pci(int chip_type)
475/* 475/*
476 * Figure out and map our MMIO regions. 476 * Figure out and map our MMIO regions.
477 */ 477 */
478static int __devinit via_pci_setup_mmio(struct viafb_dev *vdev) 478static int via_pci_setup_mmio(struct viafb_dev *vdev)
479{ 479{
480 int ret; 480 int ret;
481 /* 481 /*
@@ -550,8 +550,8 @@ static struct viafb_subdev_info {
550}; 550};
551#define N_SUBDEVS ARRAY_SIZE(viafb_subdevs) 551#define N_SUBDEVS ARRAY_SIZE(viafb_subdevs)
552 552
553static int __devinit via_create_subdev(struct viafb_dev *vdev, 553static int via_create_subdev(struct viafb_dev *vdev,
554 struct viafb_subdev_info *info) 554 struct viafb_subdev_info *info)
555{ 555{
556 int ret; 556 int ret;
557 557
@@ -573,7 +573,7 @@ static int __devinit via_create_subdev(struct viafb_dev *vdev,
573 return ret; 573 return ret;
574} 574}
575 575
576static int __devinit via_setup_subdevs(struct viafb_dev *vdev) 576static int via_setup_subdevs(struct viafb_dev *vdev)
577{ 577{
578 int i; 578 int i;
579 579
@@ -671,8 +671,7 @@ static int via_resume(struct pci_dev *pdev)
671} 671}
672#endif /* CONFIG_PM */ 672#endif /* CONFIG_PM */
673 673
674static int __devinit via_pci_probe(struct pci_dev *pdev, 674static int via_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
675 const struct pci_device_id *ent)
676{ 675{
677 int ret; 676 int ret;
678 677
@@ -716,7 +715,7 @@ out_disable:
716 return ret; 715 return ret;
717} 716}
718 717
719static void __devexit via_pci_remove(struct pci_dev *pdev) 718static void via_pci_remove(struct pci_dev *pdev)
720{ 719{
721 via_teardown_subdevs(); 720 via_teardown_subdevs();
722 via_fb_pci_remove(pdev); 721 via_fb_pci_remove(pdev);
@@ -725,7 +724,7 @@ static void __devexit via_pci_remove(struct pci_dev *pdev)
725} 724}
726 725
727 726
728static struct pci_device_id via_pci_table[] __devinitdata = { 727static struct pci_device_id via_pci_table[] = {
729 { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID), 728 { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID),
730 .driver_data = UNICHROME_CLE266 }, 729 .driver_data = UNICHROME_CLE266 },
731 { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K400_DID), 730 { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K400_DID),
@@ -760,7 +759,7 @@ static struct pci_driver via_driver = {
760 .name = "viafb", 759 .name = "viafb",
761 .id_table = via_pci_table, 760 .id_table = via_pci_table,
762 .probe = via_pci_probe, 761 .probe = via_pci_probe,
763 .remove = __devexit_p(via_pci_remove), 762 .remove = via_pci_remove,
764#ifdef CONFIG_PM 763#ifdef CONFIG_PM
765 .suspend = via_suspend, 764 .suspend = via_suspend,
766 .resume = via_resume, 765 .resume = via_resume,
diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
index d69cfef7c338..e408679081ab 100644
--- a/drivers/video/via/via-gpio.c
+++ b/drivers/video/via/via-gpio.c
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(viafb_gpio_lookup);
212/* 212/*
213 * Platform device stuff. 213 * Platform device stuff.
214 */ 214 */
215static __devinit int viafb_gpio_probe(struct platform_device *platdev) 215static int viafb_gpio_probe(struct platform_device *platdev)
216{ 216{
217 struct viafb_dev *vdev = platdev->dev.platform_data; 217 struct viafb_dev *vdev = platdev->dev.platform_data;
218 struct via_port_cfg *port_cfg = vdev->port_cfg; 218 struct via_port_cfg *port_cfg = vdev->port_cfg;
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index c80e770e1800..325c43c6ff97 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1072,7 +1072,7 @@ static int __init parse_active_dev(void)
1072 return 0; 1072 return 0;
1073} 1073}
1074 1074
1075static int __devinit parse_port(char *opt_str, int *output_interface) 1075static int parse_port(char *opt_str, int *output_interface)
1076{ 1076{
1077 if (!strncmp(opt_str, "DVP0", 4)) 1077 if (!strncmp(opt_str, "DVP0", 4))
1078 *output_interface = INTERFACE_DVP0; 1078 *output_interface = INTERFACE_DVP0;
@@ -1089,7 +1089,7 @@ static int __devinit parse_port(char *opt_str, int *output_interface)
1089 return 0; 1089 return 0;
1090} 1090}
1091 1091
1092static void __devinit parse_lcd_port(void) 1092static void parse_lcd_port(void)
1093{ 1093{
1094 parse_port(viafb_lcd_port, &viaparinfo->chip_info->lvds_chip_info. 1094 parse_port(viafb_lcd_port, &viaparinfo->chip_info->lvds_chip_info.
1095 output_interface); 1095 output_interface);
@@ -1102,7 +1102,7 @@ static void __devinit parse_lcd_port(void)
1102 output_interface); 1102 output_interface);
1103} 1103}
1104 1104
1105static void __devinit parse_dvi_port(void) 1105static void parse_dvi_port(void)
1106{ 1106{
1107 parse_port(viafb_dvi_port, &viaparinfo->chip_info->tmds_chip_info. 1107 parse_port(viafb_dvi_port, &viaparinfo->chip_info->tmds_chip_info.
1108 output_interface); 1108 output_interface);
@@ -1727,7 +1727,7 @@ static struct viafb_pm_hooks viafb_fb_pm_hooks = {
1727 1727
1728#endif 1728#endif
1729 1729
1730static void __devinit i2c_bus_probe(struct viafb_shared *shared) 1730static void i2c_bus_probe(struct viafb_shared *shared)
1731{ 1731{
1732 /* should be always CRT */ 1732 /* should be always CRT */
1733 printk(KERN_INFO "viafb: Probing I2C bus 0x26\n"); 1733 printk(KERN_INFO "viafb: Probing I2C bus 0x26\n");
@@ -1753,7 +1753,7 @@ static void i2c_bus_free(struct viafb_shared *shared)
1753 via_aux_free(shared->i2c_2C); 1753 via_aux_free(shared->i2c_2C);
1754} 1754}
1755 1755
1756int __devinit via_fb_pci_probe(struct viafb_dev *vdev) 1756int via_fb_pci_probe(struct viafb_dev *vdev)
1757{ 1757{
1758 u32 default_xres, default_yres; 1758 u32 default_xres, default_yres;
1759 struct fb_var_screeninfo default_var; 1759 struct fb_var_screeninfo default_var;
@@ -1945,7 +1945,7 @@ out_fb_release:
1945 return rc; 1945 return rc;
1946} 1946}
1947 1947
1948void __devexit via_fb_pci_remove(struct pci_dev *pdev) 1948void via_fb_pci_remove(struct pci_dev *pdev)
1949{ 1949{
1950 DEBUG_MSG(KERN_INFO "via_pci_remove!\n"); 1950 DEBUG_MSG(KERN_INFO "via_pci_remove!\n");
1951 fb_dealloc_cmap(&viafbinfo->cmap); 1951 fb_dealloc_cmap(&viafbinfo->cmap);
diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c
index 9af8da70e781..aa2579c2364a 100644
--- a/drivers/video/vt8500lcdfb.c
+++ b/drivers/video/vt8500lcdfb.c
@@ -273,7 +273,7 @@ static irqreturn_t vt8500lcd_handle_irq(int irq, void *dev_id)
273 return IRQ_HANDLED; 273 return IRQ_HANDLED;
274} 274}
275 275
276static int __devinit vt8500lcd_probe(struct platform_device *pdev) 276static int vt8500lcd_probe(struct platform_device *pdev)
277{ 277{
278 struct vt8500lcd_info *fbi; 278 struct vt8500lcd_info *fbi;
279 struct resource *res; 279 struct resource *res;
@@ -469,7 +469,7 @@ failed:
469 return ret; 469 return ret;
470} 470}
471 471
472static int __devexit vt8500lcd_remove(struct platform_device *pdev) 472static int vt8500lcd_remove(struct platform_device *pdev)
473{ 473{
474 struct vt8500lcd_info *fbi = platform_get_drvdata(pdev); 474 struct vt8500lcd_info *fbi = platform_get_drvdata(pdev);
475 struct resource *res; 475 struct resource *res;
@@ -505,7 +505,7 @@ static const struct of_device_id via_dt_ids[] = {
505 505
506static struct platform_driver vt8500lcd_driver = { 506static struct platform_driver vt8500lcd_driver = {
507 .probe = vt8500lcd_probe, 507 .probe = vt8500lcd_probe,
508 .remove = __devexit_p(vt8500lcd_remove), 508 .remove = vt8500lcd_remove,
509 .driver = { 509 .driver = {
510 .owner = THIS_MODULE, 510 .owner = THIS_MODULE,
511 .name = "vt8500-lcd", 511 .name = "vt8500-lcd",
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 4e74d262cf3e..e9557fa014ee 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -660,7 +660,7 @@ static struct fb_ops vt8623fb_ops = {
660 660
661/* PCI probe */ 661/* PCI probe */
662 662
663static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 663static int vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
664{ 664{
665 struct pci_bus_region bus_reg; 665 struct pci_bus_region bus_reg;
666 struct resource vga_res; 666 struct resource vga_res;
@@ -807,7 +807,7 @@ err_enable_device:
807 807
808/* PCI remove */ 808/* PCI remove */
809 809
810static void __devexit vt8623_pci_remove(struct pci_dev *dev) 810static void vt8623_pci_remove(struct pci_dev *dev)
811{ 811{
812 struct fb_info *info = pci_get_drvdata(dev); 812 struct fb_info *info = pci_get_drvdata(dev);
813 813
@@ -906,7 +906,7 @@ fail:
906 906
907/* List of boards that we are trying to support */ 907/* List of boards that we are trying to support */
908 908
909static struct pci_device_id vt8623_devices[] __devinitdata = { 909static struct pci_device_id vt8623_devices[] = {
910 {PCI_DEVICE(PCI_VENDOR_ID_VIA, 0x3122)}, 910 {PCI_DEVICE(PCI_VENDOR_ID_VIA, 0x3122)},
911 {0, 0, 0, 0, 0, 0, 0} 911 {0, 0, 0, 0, 0, 0, 0}
912}; 912};
@@ -917,7 +917,7 @@ static struct pci_driver vt8623fb_pci_driver = {
917 .name = "vt8623fb", 917 .name = "vt8623fb",
918 .id_table = vt8623_devices, 918 .id_table = vt8623_devices,
919 .probe = vt8623_pci_probe, 919 .probe = vt8623_pci_probe,
920 .remove = __devexit_p(vt8623_pci_remove), 920 .remove = vt8623_pci_remove,
921 .suspend = vt8623_pci_suspend, 921 .suspend = vt8623_pci_suspend,
922 .resume = vt8623_pci_resume, 922 .resume = vt8623_pci_resume,
923}; 923};
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 2f6b2b835f88..7a299e951f75 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -54,7 +54,7 @@ static void w100_update_enable(void);
54static void w100_update_disable(void); 54static void w100_update_disable(void);
55static void calc_hsync(struct w100fb_par *par); 55static void calc_hsync(struct w100fb_par *par);
56static void w100_init_graphic_engine(struct w100fb_par *par); 56static void w100_init_graphic_engine(struct w100fb_par *par);
57struct w100_pll_info *w100_get_xtal_table(unsigned int freq) __devinit; 57struct w100_pll_info *w100_get_xtal_table(unsigned int freq);
58 58
59/* Pseudo palette size */ 59/* Pseudo palette size */
60#define MAX_PALETTES 16 60#define MAX_PALETTES 16
@@ -630,7 +630,7 @@ static int w100fb_resume(struct platform_device *dev)
630#endif 630#endif
631 631
632 632
633int __devinit w100fb_probe(struct platform_device *pdev) 633int w100fb_probe(struct platform_device *pdev)
634{ 634{
635 int err = -EIO; 635 int err = -EIO;
636 struct w100fb_mach_info *inf; 636 struct w100fb_mach_info *inf;
@@ -783,7 +783,7 @@ out:
783} 783}
784 784
785 785
786static int __devexit w100fb_remove(struct platform_device *pdev) 786static int w100fb_remove(struct platform_device *pdev)
787{ 787{
788 struct fb_info *info = platform_get_drvdata(pdev); 788 struct fb_info *info = platform_get_drvdata(pdev);
789 struct w100fb_par *par=info->par; 789 struct w100fb_par *par=info->par;
@@ -1021,7 +1021,7 @@ static struct pll_entries {
1021 { 0 }, 1021 { 0 },
1022}; 1022};
1023 1023
1024struct w100_pll_info __devinit *w100_get_xtal_table(unsigned int freq) 1024struct w100_pll_info *w100_get_xtal_table(unsigned int freq)
1025{ 1025{
1026 struct pll_entries *pll_entry = w100_pll_tables; 1026 struct pll_entries *pll_entry = w100_pll_tables;
1027 1027
@@ -1624,7 +1624,7 @@ static void w100_vsync(void)
1624 1624
1625static struct platform_driver w100fb_driver = { 1625static struct platform_driver w100fb_driver = {
1626 .probe = w100fb_probe, 1626 .probe = w100fb_probe,
1627 .remove = __devexit_p(w100fb_remove), 1627 .remove = w100fb_remove,
1628 .suspend = w100fb_suspend, 1628 .suspend = w100fb_suspend,
1629 .resume = w100fb_resume, 1629 .resume = w100fb_resume,
1630 .driver = { 1630 .driver = {
diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
index 77539c1b56a0..4dd0580f96fd 100644
--- a/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@ -260,7 +260,7 @@ static struct fb_ops wm8505fb_ops = {
260 .fb_blank = wm8505fb_blank, 260 .fb_blank = wm8505fb_blank,
261}; 261};
262 262
263static int __devinit wm8505fb_probe(struct platform_device *pdev) 263static int wm8505fb_probe(struct platform_device *pdev)
264{ 264{
265 struct wm8505fb_info *fbi; 265 struct wm8505fb_info *fbi;
266 struct resource *res; 266 struct resource *res;
@@ -431,7 +431,7 @@ failed:
431 return ret; 431 return ret;
432} 432}
433 433
434static int __devexit wm8505fb_remove(struct platform_device *pdev) 434static int wm8505fb_remove(struct platform_device *pdev)
435{ 435{
436 struct wm8505fb_info *fbi = platform_get_drvdata(pdev); 436 struct wm8505fb_info *fbi = platform_get_drvdata(pdev);
437 struct resource *res; 437 struct resource *res;
@@ -462,7 +462,7 @@ static const struct of_device_id wmt_dt_ids[] = {
462 462
463static struct platform_driver wm8505fb_driver = { 463static struct platform_driver wm8505fb_driver = {
464 .probe = wm8505fb_probe, 464 .probe = wm8505fb_probe,
465 .remove = __devexit_p(wm8505fb_remove), 465 .remove = wm8505fb_remove,
466 .driver = { 466 .driver = {
467 .owner = THIS_MODULE, 467 .owner = THIS_MODULE,
468 .name = DRIVER_NAME, 468 .name = DRIVER_NAME,
diff --git a/drivers/video/wmt_ge_rops.c b/drivers/video/wmt_ge_rops.c
index ba025b4c7d09..4aaeb18223bc 100644
--- a/drivers/video/wmt_ge_rops.c
+++ b/drivers/video/wmt_ge_rops.c
@@ -124,7 +124,7 @@ int wmt_ge_sync(struct fb_info *p)
124} 124}
125EXPORT_SYMBOL_GPL(wmt_ge_sync); 125EXPORT_SYMBOL_GPL(wmt_ge_sync);
126 126
127static int __devinit wmt_ge_rops_probe(struct platform_device *pdev) 127static int wmt_ge_rops_probe(struct platform_device *pdev)
128{ 128{
129 struct resource *res; 129 struct resource *res;
130 130
@@ -152,7 +152,7 @@ static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
152 return 0; 152 return 0;
153} 153}
154 154
155static int __devexit wmt_ge_rops_remove(struct platform_device *pdev) 155static int wmt_ge_rops_remove(struct platform_device *pdev)
156{ 156{
157 iounmap(regbase); 157 iounmap(regbase);
158 return 0; 158 return 0;
@@ -165,7 +165,7 @@ static const struct of_device_id wmt_dt_ids[] = {
165 165
166static struct platform_driver wmt_ge_rops_driver = { 166static struct platform_driver wmt_ge_rops_driver = {
167 .probe = wmt_ge_rops_probe, 167 .probe = wmt_ge_rops_probe,
168 .remove = __devexit_p(wmt_ge_rops_remove), 168 .remove = wmt_ge_rops_remove,
169 .driver = { 169 .driver = {
170 .owner = THIS_MODULE, 170 .owner = THIS_MODULE,
171 .name = "wmt_ge_rops", 171 .name = "wmt_ge_rops",
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 917bb5681684..cd005c227a23 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -358,8 +358,8 @@ static irqreturn_t xenfb_event_handler(int rq, void *dev_id)
358 return IRQ_HANDLED; 358 return IRQ_HANDLED;
359} 359}
360 360
361static int __devinit xenfb_probe(struct xenbus_device *dev, 361static int xenfb_probe(struct xenbus_device *dev,
362 const struct xenbus_device_id *id) 362 const struct xenbus_device_id *id)
363{ 363{
364 struct xenfb_info *info; 364 struct xenfb_info *info;
365 struct fb_info *fb_info; 365 struct fb_info *fb_info;
@@ -487,8 +487,7 @@ error:
487 return ret; 487 return ret;
488} 488}
489 489
490static __devinit void 490static void xenfb_make_preferred_console(void)
491xenfb_make_preferred_console(void)
492{ 491{
493 struct console *c; 492 struct console *c;
494 493
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 18084525402a..af0b4fdf9aa9 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -403,7 +403,7 @@ static int xilinxfb_release(struct device *dev)
403 * OF bus binding 403 * OF bus binding
404 */ 404 */
405 405
406static int __devinit xilinxfb_of_probe(struct platform_device *op) 406static int xilinxfb_of_probe(struct platform_device *op)
407{ 407{
408 const u32 *prop; 408 const u32 *prop;
409 u32 *p; 409 u32 *p;
@@ -485,13 +485,13 @@ static int __devinit xilinxfb_of_probe(struct platform_device *op)
485 return -ENODEV; 485 return -ENODEV;
486} 486}
487 487
488static int __devexit xilinxfb_of_remove(struct platform_device *op) 488static int xilinxfb_of_remove(struct platform_device *op)
489{ 489{
490 return xilinxfb_release(&op->dev); 490 return xilinxfb_release(&op->dev);
491} 491}
492 492
493/* Match table for of_platform binding */ 493/* Match table for of_platform binding */
494static struct of_device_id xilinxfb_of_match[] __devinitdata = { 494static struct of_device_id xilinxfb_of_match[] = {
495 { .compatible = "xlnx,xps-tft-1.00.a", }, 495 { .compatible = "xlnx,xps-tft-1.00.a", },
496 { .compatible = "xlnx,xps-tft-2.00.a", }, 496 { .compatible = "xlnx,xps-tft-2.00.a", },
497 { .compatible = "xlnx,xps-tft-2.01.a", }, 497 { .compatible = "xlnx,xps-tft-2.01.a", },
@@ -503,7 +503,7 @@ MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
503 503
504static struct platform_driver xilinxfb_of_driver = { 504static struct platform_driver xilinxfb_of_driver = {
505 .probe = xilinxfb_of_probe, 505 .probe = xilinxfb_of_probe,
506 .remove = __devexit_p(xilinxfb_of_remove), 506 .remove = xilinxfb_of_remove,
507 .driver = { 507 .driver = {
508 .name = DRIVER_NAME, 508 .name = DRIVER_NAME,
509 .owner = THIS_MODULE, 509 .owner = THIS_MODULE,