dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:07:39 -08:00
parent 8590dbc79a
commit 48c68c4f1b
135 changed files with 1017 additions and 1129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/acornfb.c
View File

@ -66,7 +66,7 @@
* have. Allow 1% either way on the nominal for TVs. * have. Allow 1% either way on the nominal for TVs.
*/ */
#define NR_MONTYPES 6 #define NR_MONTYPES 6
static struct fb_monspecs monspecs[NR_MONTYPES] __devinitdata = { static struct fb_monspecs monspecs[NR_MONTYPES] = {
{ /* TV */ { /* TV */
.hfmin = 15469, .hfmin = 15469,
.hfmax = 15781, .hfmax = 15781,
@ -874,7 +874,7 @@ static struct fb_ops acornfb_ops = {
/* /*
* Everything after here is initialisation!!! * Everything after here is initialisation!!!
*/ */
static struct fb_videomode modedb[] __devinitdata = { static struct fb_videomode modedb[] = {
{ /* 320x256 @ 50Hz */ { /* 320x256 @ 50Hz */
NULL, 50, 320, 256, 125000, 92, 62, 35, 19, 38, 2, NULL, 50, 320, 256, 125000, 92, 62, 35, 19, 38, 2,
FB_SYNC_COMP_HIGH_ACT, FB_SYNC_COMP_HIGH_ACT,
@ -926,7 +926,7 @@ static struct fb_videomode modedb[] __devinitdata = {
} }
}; };
static struct fb_videomode acornfb_default_mode __devinitdata = { static struct fb_videomode acornfb_default_mode = {
.name = NULL, .name = NULL,
.refresh = 60, .refresh = 60,
.xres = 640, .xres = 640,
@ -942,7 +942,7 @@ static struct fb_videomode acornfb_default_mode __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED .vmode = FB_VMODE_NONINTERLACED
}; };
static void __devinit acornfb_init_fbinfo(void) static void acornfb_init_fbinfo(void)
{ {
static int first = 1; static int first = 1;
@ -1018,7 +1018,7 @@ static void __devinit acornfb_init_fbinfo(void)
* size can optionally be followed by 'M' or 'K' for * size can optionally be followed by 'M' or 'K' for
* MB or KB respectively. * MB or KB respectively.
*/ */
static void __devinit acornfb_parse_mon(char *opt) static void acornfb_parse_mon(char *opt)
{ {
char *p = opt; char *p = opt;
@ -1065,7 +1065,7 @@ bad:
current_par.montype = -1; current_par.montype = -1;
} }
static void __devinit acornfb_parse_montype(char *opt) static void acornfb_parse_montype(char *opt)
{ {
current_par.montype = -2; current_par.montype = -2;
@ -1106,7 +1106,7 @@ static void __devinit acornfb_parse_montype(char *opt)
} }
} }
static void __devinit acornfb_parse_dram(char *opt) static void acornfb_parse_dram(char *opt)
{ {
unsigned int size; unsigned int size;
@ -1131,14 +1131,14 @@ static void __devinit acornfb_parse_dram(char *opt)
static struct options { static struct options {
char *name; char *name;
void (*parse)(char *opt); void (*parse)(char *opt);
} opt_table[] __devinitdata = { } opt_table[] = {
{ "mon", acornfb_parse_mon }, { "mon", acornfb_parse_mon },
{ "montype", acornfb_parse_montype }, { "montype", acornfb_parse_montype },
{ "dram", acornfb_parse_dram }, { "dram", acornfb_parse_dram },
{ NULL, NULL } { NULL, NULL }
}; };
static int __devinit acornfb_setup(char *options) static int acornfb_setup(char *options)
{ {
struct options *optp; struct options *optp;
char *opt; char *opt;
@ -1175,7 +1175,7 @@ static int __devinit acornfb_setup(char *options)
* Detect type of monitor connected * Detect type of monitor connected
* For now, we just assume SVGA * For now, we just assume SVGA
*/ */
static int __devinit acornfb_detect_monitortype(void) static int acornfb_detect_monitortype(void)
{ {
return 4; return 4;
} }
@ -1216,7 +1216,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
printk("acornfb: freed %dK memory\n", mb_freed); printk("acornfb: freed %dK memory\n", mb_freed);
} }
static int __devinit acornfb_probe(struct platform_device *dev) static int acornfb_probe(struct platform_device *dev)
{ {
unsigned long size; unsigned long size;
u_int h_sync, v_sync; u_int h_sync, v_sync;

10
drivers/video/arcfb.c
View File

@ -79,7 +79,7 @@ struct arcfb_par {
spinlock_t lock; spinlock_t lock;
}; };
static struct fb_fix_screeninfo arcfb_fix __devinitdata = { static struct fb_fix_screeninfo arcfb_fix = {
.id = "arcfb", .id = "arcfb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_MONO01, .visual = FB_VISUAL_MONO01,
@ -89,7 +89,7 @@ static struct fb_fix_screeninfo arcfb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo arcfb_var __devinitdata = { static struct fb_var_screeninfo arcfb_var = {
.xres = 128, .xres = 128,
.yres = 64, .yres = 64,
.xres_virtual = 128, .xres_virtual = 128,
@ -502,7 +502,7 @@ static struct fb_ops arcfb_ops = {
.fb_ioctl = arcfb_ioctl, .fb_ioctl = arcfb_ioctl,
}; };
static int __devinit arcfb_probe(struct platform_device *dev) static int arcfb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
int retval = -ENOMEM; int retval = -ENOMEM;
@ -587,7 +587,7 @@ err:
return retval; return retval;
} }
static int __devexit arcfb_remove(struct platform_device *dev) static int arcfb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
@ -601,7 +601,7 @@ static int __devexit arcfb_remove(struct platform_device *dev)
static struct platform_driver arcfb_driver = { static struct platform_driver arcfb_driver = {
.probe = arcfb_probe, .probe = arcfb_probe,
.remove = __devexit_p(arcfb_remove), .remove = arcfb_remove,
.driver = { .driver = {
.name = "arcfb", .name = "arcfb",
}, },

10
drivers/video/arkfb.c
View File

@ -100,7 +100,7 @@ static const struct svga_timing_regs ark_timing_regs = {
/* Module parameters */ /* Module parameters */
static char *mode_option __devinitdata = "640x480-8@60"; static char *mode_option = "640x480-8@60";
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static int mtrr = 1; static int mtrr = 1;
@ -950,7 +950,7 @@ static struct fb_ops arkfb_ops = {
/* PCI probe */ /* PCI probe */
static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct pci_bus_region bus_reg; struct pci_bus_region bus_reg;
struct resource vga_res; struct resource vga_res;
@ -1086,7 +1086,7 @@ err_enable_device:
/* PCI remove */ /* PCI remove */
static void __devexit ark_pci_remove(struct pci_dev *dev) static void ark_pci_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
@ -1184,7 +1184,7 @@ fail:
/* List of boards that we are trying to support */ /* List of boards that we are trying to support */
static struct pci_device_id ark_devices[] __devinitdata = { static struct pci_device_id ark_devices[] = {
{PCI_DEVICE(0xEDD8, 0xA099)}, {PCI_DEVICE(0xEDD8, 0xA099)},
{0, 0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0, 0}
}; };
@ -1196,7 +1196,7 @@ static struct pci_driver arkfb_pci_driver = {
.name = "arkfb", .name = "arkfb",
.id_table = ark_devices, .id_table = ark_devices,
.probe = ark_pci_probe, .probe = ark_pci_probe,
.remove = __devexit_p(ark_pci_remove), .remove = ark_pci_remove,
.suspend = ark_pci_suspend, .suspend = ark_pci_suspend,
.resume = ark_pci_resume, .resume = ark_pci_resume,
}; };

18
drivers/video/asiliantfb.c
View File

@ -451,7 +451,7 @@ static struct chips_init_reg chips_init_xr[] =
{0xd1, 0x01}, {0xd1, 0x01},
}; };
static void __devinit chips_hw_init(struct fb_info *p) static void chips_hw_init(struct fb_info *p)
{ {
int i; int i;
@ -474,7 +474,7 @@ static void __devinit chips_hw_init(struct fb_info *p)
write_fr(chips_init_fr[i].addr, chips_init_fr[i].data); write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
} }
static struct fb_fix_screeninfo asiliantfb_fix __devinitdata = { static struct fb_fix_screeninfo asiliantfb_fix = {
.id = "Asiliant 69000", .id = "Asiliant 69000",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -483,7 +483,7 @@ static struct fb_fix_screeninfo asiliantfb_fix __devinitdata = {
.smem_len = 0x200000, /* 2MB */ .smem_len = 0x200000, /* 2MB */
}; };
static struct fb_var_screeninfo asiliantfb_var __devinitdata = { static struct fb_var_screeninfo asiliantfb_var = {
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
.xres_virtual = 640, .xres_virtual = 640,
@ -504,7 +504,7 @@ static struct fb_var_screeninfo asiliantfb_var __devinitdata = {
.vsync_len = 2, .vsync_len = 2,
}; };
static int __devinit init_asiliant(struct fb_info *p, unsigned long addr) static int init_asiliant(struct fb_info *p, unsigned long addr)
{ {
int err; int err;
@ -535,8 +535,8 @@ static int __devinit init_asiliant(struct fb_info *p, unsigned long addr)
return 0; return 0;
} }
static int __devinit static int asiliantfb_pci_init(struct pci_dev *dp,
asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
unsigned long addr, size; unsigned long addr, size;
struct fb_info *p; struct fb_info *p;
@ -581,7 +581,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
return 0; return 0;
} }
static void __devexit asiliantfb_remove(struct pci_dev *dp) static void asiliantfb_remove(struct pci_dev *dp)
{ {
struct fb_info *p = pci_get_drvdata(dp); struct fb_info *p = pci_get_drvdata(dp);
@ -593,7 +593,7 @@ static void __devexit asiliantfb_remove(struct pci_dev *dp)
framebuffer_release(p); framebuffer_release(p);
} }
static struct pci_device_id asiliantfb_pci_tbl[] __devinitdata = { static struct pci_device_id asiliantfb_pci_tbl[] = {
{ PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID },
{ 0 } { 0 }
}; };
@ -604,7 +604,7 @@ static struct pci_driver asiliantfb_driver = {
.name = "asiliantfb", .name = "asiliantfb",
.id_table = asiliantfb_pci_tbl, .id_table = asiliantfb_pci_tbl,
.probe = asiliantfb_pci_init, .probe = asiliantfb_pci_init,
.remove = __devexit_p(asiliantfb_remove), .remove = asiliantfb_remove,
}; };
static int __init asiliantfb_init(void) static int __init asiliantfb_init(void)

51
drivers/video/aty/aty128fb.c
View File

@ -98,7 +98,7 @@
#ifndef CONFIG_PPC_PMAC #ifndef CONFIG_PPC_PMAC
/* default mode */ /* default mode */
static struct fb_var_screeninfo default_var __devinitdata = { static struct fb_var_screeninfo default_var = {
/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */ /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
640, 480, 640, 480, 0, 0, 8, 0, 640, 480, 640, 480, 0, 0, 8, 0,
{0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0}, {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},
@ -121,7 +121,7 @@ static struct fb_var_screeninfo default_var = {
/* default modedb mode */ /* default modedb mode */
/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */ /* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
static struct fb_videomode defaultmode __devinitdata = { static struct fb_videomode defaultmode = {
.refresh = 60, .refresh = 60,
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -149,7 +149,7 @@ enum {
}; };
/* Must match above enum */ /* Must match above enum */
static char * const r128_family[] __devinitconst = { static char * const r128_family[] = {
"AGP", "AGP",
"PCI", "PCI",
"PRO AGP", "PRO AGP",
@ -275,7 +275,7 @@ static struct pci_driver aty128fb_driver = {
.name = "aty128fb", .name = "aty128fb",
.id_table = aty128_pci_tbl, .id_table = aty128_pci_tbl,
.probe = aty128_probe, .probe = aty128_probe,
.remove = __devexit_p(aty128_remove), .remove = aty128_remove,
.suspend = aty128_pci_suspend, .suspend = aty128_pci_suspend,
.resume = aty128_pci_resume, .resume = aty128_pci_resume,
}; };
@ -333,7 +333,7 @@ static const struct aty128_meminfo sdr_sgram =
static const struct aty128_meminfo ddr_sgram = static const struct aty128_meminfo ddr_sgram =
{ 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" }; { 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" };
static struct fb_fix_screeninfo aty128fb_fix __devinitdata = { static struct fb_fix_screeninfo aty128fb_fix = {
.id = "ATY Rage128", .id = "ATY Rage128",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -343,24 +343,24 @@ static struct fb_fix_screeninfo aty128fb_fix __devinitdata = {
.accel = FB_ACCEL_ATI_RAGE128, .accel = FB_ACCEL_ATI_RAGE128,
}; };
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
static int default_vmode __devinitdata = VMODE_1024_768_60; static int default_vmode = VMODE_1024_768_60;
static int default_cmode __devinitdata = CMODE_8; static int default_cmode = CMODE_8;
#endif #endif
static int default_crt_on __devinitdata = 0; static int default_crt_on = 0;
static int default_lcd_on __devinitdata = 1; static int default_lcd_on = 1;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static bool mtrr = true; static bool mtrr = true;
#endif #endif
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
static int backlight __devinitdata = 1; static int backlight = 1;
#else #else
static int backlight __devinitdata = 0; static int backlight = 0;
#endif #endif
/* PLL constants */ /* PLL constants */
@ -449,9 +449,8 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
static int aty128_decode_var(struct fb_var_screeninfo *var, static int aty128_decode_var(struct fb_var_screeninfo *var,
struct aty128fb_par *par); struct aty128fb_par *par);
#if 0 #if 0
static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, static void aty128_get_pllinfo(struct aty128fb_par *par, void __iomem *bios);
void __iomem *bios); static void __iomem *aty128_map_ROM(struct pci_dev *pdev,
static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev,
const struct aty128fb_par *par); const struct aty128fb_par *par);
#endif #endif
static void aty128_timings(struct aty128fb_par *par); static void aty128_timings(struct aty128fb_par *par);
@ -582,7 +581,7 @@ static void aty_pll_writeupdate(const struct aty128fb_par *par)
/* write to the scratch register to test r/w functionality */ /* write to the scratch register to test r/w functionality */
static int __devinit register_test(const struct aty128fb_par *par) static int register_test(const struct aty128fb_par *par)
{ {
u32 val; u32 val;
int flag = 0; int flag = 0;
@ -781,7 +780,7 @@ static u32 depth_to_dst(u32 depth)
#ifndef __sparc__ #ifndef __sparc__
static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, static void __iomem *aty128_map_ROM(const struct aty128fb_par *par,
struct pci_dev *dev) struct pci_dev *dev)
{ {
u16 dptr; u16 dptr;
@ -868,7 +867,7 @@ static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par,
return NULL; return NULL;
} }
static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, static void aty128_get_pllinfo(struct aty128fb_par *par,
unsigned char __iomem *bios) unsigned char __iomem *bios)
{ {
unsigned int bios_hdr; unsigned int bios_hdr;
@ -891,7 +890,7 @@ static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,
} }
#ifdef CONFIG_X86 #ifdef CONFIG_X86
static void __iomem * __devinit aty128_find_mem_vbios(struct aty128fb_par *par) static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)
{ {
/* I simplified this code as we used to miss the signatures in /* I simplified this code as we used to miss the signatures in
* a lot of case. It's now closer to XFree, we just don't check * 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)
#endif /* ndef(__sparc__) */ #endif /* ndef(__sparc__) */
/* fill in known card constants if pll_block is not available */ /* fill in known card constants if pll_block is not available */
static void __devinit aty128_timings(struct aty128fb_par *par) static void aty128_timings(struct aty128fb_par *par)
{ {
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
/* instead of a table lookup, assume OF has properly /* instead of a table lookup, assume OF has properly
@ -1658,7 +1657,7 @@ static int aty128fb_sync(struct fb_info *info)
} }
#ifndef MODULE #ifndef MODULE
static int __devinit aty128fb_setup(char *options) static int aty128fb_setup(char *options)
{ {
char *this_opt; char *this_opt;
@ -1888,8 +1887,7 @@ static void aty128_early_resume(void *data)
} }
#endif /* CONFIG_PPC_PMAC */ #endif /* CONFIG_PPC_PMAC */
static int __devinit aty128_init(struct pci_dev *pdev, static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct aty128fb_par *par = info->par; struct aty128fb_par *par = info->par;
@ -2039,8 +2037,7 @@ static int __devinit aty128_init(struct pci_dev *pdev,
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* register a card ++ajoshi */ /* register a card ++ajoshi */
static int __devinit aty128_probe(struct pci_dev *pdev, static int aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
unsigned long fb_addr, reg_addr; unsigned long fb_addr, reg_addr;
struct aty128fb_par *par; struct aty128fb_par *par;
@ -2156,7 +2153,7 @@ err_free_fb:
return -ENODEV; return -ENODEV;
} }
static void __devexit aty128_remove(struct pci_dev *pdev) static void aty128_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct aty128fb_par *par; struct aty128fb_par *par;
@ -2558,7 +2555,7 @@ static int aty128_pci_resume(struct pci_dev *pdev)
} }
static int __devinit aty128fb_init(void) static int aty128fb_init(void)
{ {
#ifndef MODULE #ifndef MODULE
char *option = NULL; char *option = NULL;

76
drivers/video/aty/atyfb_base.c
View File

@ -214,7 +214,7 @@ struct pci_mmap_map {
unsigned long prot_mask; unsigned long prot_mask;
}; };
static struct fb_fix_screeninfo atyfb_fix __devinitdata = { static struct fb_fix_screeninfo atyfb_fix = {
.id = "ATY Mach64", .id = "ATY Mach64",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -309,18 +309,18 @@ static int vram;
static int pll; static int pll;
static int mclk; static int mclk;
static int xclk; static int xclk;
static int comp_sync __devinitdata = -1; static int comp_sync = -1;
static char *mode; static char *mode;
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
static int backlight __devinitdata = 1; static int backlight = 1;
#else #else
static int backlight __devinitdata = 0; static int backlight = 0;
#endif #endif
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
static int default_vmode __devinitdata = VMODE_CHOOSE; static int default_vmode = VMODE_CHOOSE;
static int default_cmode __devinitdata = CMODE_CHOOSE; static int default_cmode = CMODE_CHOOSE;
module_param_named(vmode, default_vmode, int, 0); module_param_named(vmode, default_vmode, int, 0);
MODULE_PARM_DESC(vmode, "int: video mode for mac"); MODULE_PARM_DESC(vmode, "int: video mode for mac");
@ -329,10 +329,10 @@ MODULE_PARM_DESC(cmode, "int: color mode for mac");
#endif #endif
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
static unsigned int mach64_count __devinitdata = 0; static unsigned int mach64_count = 0;
static unsigned long phys_vmembase[FB_MAX] __devinitdata = { 0, }; static unsigned long phys_vmembase[FB_MAX] = { 0, };
static unsigned long phys_size[FB_MAX] __devinitdata = { 0, }; static unsigned long phys_size[FB_MAX] = { 0, };
static unsigned long phys_guiregbase[FB_MAX] __devinitdata = { 0, }; static unsigned long phys_guiregbase[FB_MAX] = { 0, };
#endif #endif
/* top -> down is an evolution of mach64 chipset, any corrections? */ /* top -> down is an evolution of mach64 chipset, any corrections? */
@ -371,7 +371,7 @@ static struct {
const char *name; const char *name;
int pll, mclk, xclk, ecp_max; int pll, mclk, xclk, ecp_max;
u32 features; u32 features;
} aty_chips[] __devinitdata = { } aty_chips[] = {
#ifdef CONFIG_FB_ATY_GX #ifdef CONFIG_FB_ATY_GX
/* Mach64 GX */ /* Mach64 GX */
{ PCI_CHIP_MACH64GX, "ATI888GX00 (Mach64 GX)", 135, 50, 50, 0, ATI_CHIP_88800GX }, { PCI_CHIP_MACH64GX, "ATI888GX00 (Mach64 GX)", 135, 50, 50, 0, ATI_CHIP_88800GX },
@ -426,7 +426,7 @@ static struct {
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
}; };
static int __devinit correct_chipset(struct atyfb_par *par) static int correct_chipset(struct atyfb_par *par)
{ {
u8 rev; u8 rev;
u16 type; u16 type;
@ -531,34 +531,34 @@ static int __devinit correct_chipset(struct atyfb_par *par)
return 0; return 0;
} }
static char ram_dram[] __devinitdata = "DRAM"; static char ram_dram[] = "DRAM";
static char ram_resv[] __devinitdata = "RESV"; static char ram_resv[] = "RESV";
#ifdef CONFIG_FB_ATY_GX #ifdef CONFIG_FB_ATY_GX
static char ram_vram[] __devinitdata = "VRAM"; static char ram_vram[] = "VRAM";
#endif /* CONFIG_FB_ATY_GX */ #endif /* CONFIG_FB_ATY_GX */
#ifdef CONFIG_FB_ATY_CT #ifdef CONFIG_FB_ATY_CT
static char ram_edo[] __devinitdata = "EDO"; static char ram_edo[] = "EDO";
static char ram_sdram[] __devinitdata = "SDRAM (1:1)"; static char ram_sdram[] = "SDRAM (1:1)";
static char ram_sgram[] __devinitdata = "SGRAM (1:1)"; static char ram_sgram[] = "SGRAM (1:1)";
static char ram_sdram32[] __devinitdata = "SDRAM (2:1) (32-bit)"; static char ram_sdram32[] = "SDRAM (2:1) (32-bit)";
static char ram_wram[] __devinitdata = "WRAM"; static char ram_wram[] = "WRAM";
static char ram_off[] __devinitdata = "OFF"; static char ram_off[] = "OFF";
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
#ifdef CONFIG_FB_ATY_GX #ifdef CONFIG_FB_ATY_GX
static char *aty_gx_ram[8] __devinitdata = { static char *aty_gx_ram[8] = {
ram_dram, ram_vram, ram_vram, ram_dram, ram_dram, ram_vram, ram_vram, ram_dram,
ram_dram, ram_vram, ram_vram, ram_resv ram_dram, ram_vram, ram_vram, ram_resv
}; };
#endif /* CONFIG_FB_ATY_GX */ #endif /* CONFIG_FB_ATY_GX */
#ifdef CONFIG_FB_ATY_CT #ifdef CONFIG_FB_ATY_CT
static char *aty_ct_ram[8] __devinitdata = { static char *aty_ct_ram[8] = {
ram_off, ram_dram, ram_edo, ram_edo, ram_off, ram_dram, ram_edo, ram_edo,
ram_sdram, ram_sgram, ram_wram, ram_resv ram_sdram, ram_sgram, ram_wram, ram_resv
}; };
static char *aty_xl_ram[8] __devinitdata = { static char *aty_xl_ram[8] = {
ram_off, ram_dram, ram_edo, ram_edo, ram_off, ram_dram, ram_edo, ram_edo,
ram_sdram, ram_sgram, ram_sdram32, ram_resv ram_sdram, ram_sgram, ram_sdram32, ram_resv
}; };
@ -588,7 +588,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var,
* Apple monitor sense * Apple monitor sense
*/ */
static int __devinit read_aty_sense(const struct atyfb_par *par) static int read_aty_sense(const struct atyfb_par *par)
{ {
int sense, i; int sense, i;
@ -2273,7 +2273,7 @@ static void aty_bl_exit(struct backlight_device *bd)
#endif /* CONFIG_FB_ATY_BACKLIGHT */ #endif /* CONFIG_FB_ATY_BACKLIGHT */
static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk) static void aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
{ {
const int ragepro_tbl[] = { const int ragepro_tbl[] = {
44, 50, 55, 66, 75, 80, 100 44, 50, 55, 66, 75, 80, 100
@ -2307,7 +2307,7 @@ static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
static struct fb_info *fb_list = NULL; static struct fb_info *fb_list = NULL;
#if defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) #if defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD)
static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par, static int atyfb_get_timings_from_lcd(struct atyfb_par *par,
struct fb_var_screeninfo *var) struct fb_var_screeninfo *var)
{ {
int ret = -EINVAL; int ret = -EINVAL;
@ -2333,7 +2333,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
} }
#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */ #endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
static int __devinit aty_init(struct fb_info *info) static int aty_init(struct fb_info *info)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
const char *ramname = NULL, *xtal; const char *ramname = NULL, *xtal;
@ -2787,7 +2787,7 @@ aty_init_exit:
} }
#if defined(CONFIG_ATARI) && !defined(MODULE) #if defined(CONFIG_ATARI) && !defined(MODULE)
static int __devinit store_video_par(char *video_str, unsigned char m64_num) static int store_video_par(char *video_str, unsigned char m64_num)
{ {
char *p; char *p;
unsigned long vmembase, size, guiregbase; unsigned long vmembase, size, guiregbase;
@ -2961,8 +2961,7 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
#ifdef __sparc__ #ifdef __sparc__
static int __devinit atyfb_setup_sparc(struct pci_dev *pdev, static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,
struct fb_info *info,
unsigned long addr) unsigned long addr)
{ {
struct atyfb_par *par = info->par; struct atyfb_par *par = info->par;
@ -3161,7 +3160,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
#ifdef __i386__ #ifdef __i386__
#ifdef CONFIG_FB_ATY_GENERIC_LCD #ifdef CONFIG_FB_ATY_GENERIC_LCD
static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) static void aty_init_lcd(struct atyfb_par *par, u32 bios_base)
{ {
u32 driv_inf_tab, sig; u32 driv_inf_tab, sig;
u16 lcd_ofs; u16 lcd_ofs;
@ -3392,7 +3391,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
} }
#endif /* CONFIG_FB_ATY_GENERIC_LCD */ #endif /* CONFIG_FB_ATY_GENERIC_LCD */
static int __devinit init_from_bios(struct atyfb_par *par) static int init_from_bios(struct atyfb_par *par)
{ {
u32 bios_base, rom_addr; u32 bios_base, rom_addr;
int ret; int ret;
@ -3445,8 +3444,7 @@ static int __devinit init_from_bios(struct atyfb_par *par)
} }
#endif /* __i386__ */ #endif /* __i386__ */
static int __devinit atyfb_setup_generic(struct pci_dev *pdev, static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info,
struct fb_info *info,
unsigned long addr) unsigned long addr)
{ {
struct atyfb_par *par = info->par; struct atyfb_par *par = info->par;
@ -3525,7 +3523,7 @@ atyfb_setup_generic_fail:
#endif /* !__sparc__ */ #endif /* !__sparc__ */
static int __devinit atyfb_pci_probe(struct pci_dev *pdev, static int atyfb_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
unsigned long addr, res_start, res_size; unsigned long addr, res_start, res_size;
@ -3714,7 +3712,7 @@ static int __init atyfb_atari_probe(void)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static void __devexit atyfb_remove(struct fb_info *info) static void atyfb_remove(struct fb_info *info)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
@ -3762,7 +3760,7 @@ static void __devexit atyfb_remove(struct fb_info *info)
} }
static void __devexit atyfb_pci_remove(struct pci_dev *pdev) static void atyfb_pci_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
@ -3834,7 +3832,7 @@ static struct pci_driver atyfb_driver = {
.name = "atyfb", .name = "atyfb",
.id_table = atyfb_pci_tbl, .id_table = atyfb_pci_tbl,
.probe = atyfb_pci_probe, .probe = atyfb_pci_probe,
.remove = __devexit_p(atyfb_pci_remove), .remove = atyfb_pci_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = atyfb_pci_suspend, .suspend = atyfb_pci_suspend,
.resume = atyfb_pci_resume, .resume = atyfb_pci_resume,

6
drivers/video/aty/mach64_ct.c
View File

@ -373,8 +373,7 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)
#endif #endif
} }
static void __devinit aty_get_pll_ct(const struct fb_info *info, static void aty_get_pll_ct(const struct fb_info *info, union aty_pll *pll)
union aty_pll *pll)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 tmp, clock; u8 tmp, clock;
@ -397,8 +396,7 @@ static void __devinit aty_get_pll_ct(const struct fb_info *info,
} }
} }
static int __devinit aty_init_pll_ct(const struct fb_info *info, static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
union aty_pll *pll)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 mpost_div, xpost_div, sclk_post_div_real; u8 mpost_div, xpost_div, sclk_post_div_real;

2
drivers/video/aty/mach64_cursor.c
View File

@ -183,7 +183,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
return 0; return 0;
} }
int __devinit aty_init_cursor(struct fb_info *info) int aty_init_cursor(struct fb_info *info)
{ {
unsigned long addr; unsigned long addr;

18
drivers/video/aty/radeon_base.c
View File

@ -293,7 +293,7 @@ static void radeon_unmap_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
pci_unmap_rom(dev, rinfo->bios_seg); pci_unmap_rom(dev, rinfo->bios_seg);
} }
static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev) static int radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
{ {
void __iomem *rom; void __iomem *rom;
u16 dptr; u16 dptr;
@ -388,7 +388,7 @@ static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev
} }
#ifdef CONFIG_X86 #ifdef CONFIG_X86
static int __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo) static int radeon_find_mem_vbios(struct radeonfb_info *rinfo)
{ {
/* I simplified this code as we used to miss the signatures in /* I simplified this code as we used to miss the signatures in
* a lot of case. It's now closer to XFree, we just don't check * 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)
* Read XTAL (ref clock), SCLK and MCLK from Open Firmware device * Read XTAL (ref clock), SCLK and MCLK from Open Firmware device
* tree. Hopefully, ATI OF driver is kind enough to fill these * tree. Hopefully, ATI OF driver is kind enough to fill these
*/ */
static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo) static int radeon_read_xtal_OF(struct radeonfb_info *rinfo)
{ {
struct device_node *dp = rinfo->of_node; struct device_node *dp = rinfo->of_node;
const u32 *val; const u32 *val;
@ -453,7 +453,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
/* /*
* Read PLL infos from chip registers * Read PLL infos from chip registers
*/ */
static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo) static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
{ {
unsigned char ppll_div_sel; unsigned char ppll_div_sel;
unsigned Ns, Nm, M; unsigned Ns, Nm, M;
@ -591,7 +591,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
/* /*
* Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...) * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...)
*/ */
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) static void radeon_get_pllinfo(struct radeonfb_info *rinfo)
{ {
/* /*
* In the case nothing works, these are defaults; they are mostly * In the case nothing works, these are defaults; they are mostly
@ -1868,7 +1868,7 @@ static struct fb_ops radeonfb_ops = {
}; };
static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) static int radeon_set_fbinfo(struct radeonfb_info *rinfo)
{ {
struct fb_info *info = rinfo->info; struct fb_info *info = rinfo->info;
@ -2143,7 +2143,7 @@ static struct bin_attribute edid2_attr = {
}; };
static int __devinit radeonfb_pci_register (struct pci_dev *pdev, static int radeonfb_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
@ -2407,7 +2407,7 @@ err_out:
static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev) static void radeonfb_pci_unregister(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par; struct radeonfb_info *rinfo = info->par;
@ -2465,7 +2465,7 @@ static struct pci_driver radeonfb_driver = {
.name = "radeonfb", .name = "radeonfb",
.id_table = radeonfb_pci_table, .id_table = radeonfb_pci_table,
.probe = radeonfb_pci_register, .probe = radeonfb_pci_register,
.remove = __devexit_p(radeonfb_pci_unregister), .remove = radeonfb_pci_unregister,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = radeonfb_pci_suspend, .suspend = radeonfb_pci_suspend,
.resume = radeonfb_pci_resume, .resume = radeonfb_pci_resume,

16
drivers/video/aty/radeon_monitor.c
View File

@ -62,7 +62,7 @@ static char *radeon_get_mon_name(int type)
* models with broken OF probing by hard-coding known EDIDs for some Mac * models with broken OF probing by hard-coding known EDIDs for some Mac
* laptops internal LVDS panel. (XXX: not done yet) * laptops internal LVDS panel. (XXX: not done yet)
*/ */
static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_EDID, static int radeon_parse_montype_prop(struct device_node *dp, u8 **out_EDID,
int hdno) int hdno)
{ {
static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID", static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
@ -115,7 +115,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
return mt; return mt;
} }
static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no, static int radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no,
u8 **out_EDID) u8 **out_EDID)
{ {
struct device_node *dp; struct device_node *dp;
@ -163,7 +163,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ #endif /* CONFIG_PPC_OF || CONFIG_SPARC */
static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo) static int radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
{ {
unsigned long tmp, tmp0; unsigned long tmp, tmp0;
char stmp[30]; char stmp[30];
@ -251,7 +251,7 @@ static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
* doesn't quite work yet, but it's output is still useful for * doesn't quite work yet, but it's output is still useful for
* debugging * debugging
*/ */
static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo) static void radeon_parse_connector_info(struct radeonfb_info *rinfo)
{ {
int offset, chips, connectors, tmp, i, conn, type; int offset, chips, connectors, tmp, i, conn, type;
@ -297,7 +297,7 @@ static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo)
* as well and currently is only implemented for the CRT DAC, the * as well and currently is only implemented for the CRT DAC, the
* code for the TVDAC is commented out in XFree as "non working" * code for the TVDAC is commented out in XFree as "non working"
*/ */
static int __devinit radeon_crt_is_connected(struct radeonfb_info *rinfo, int is_crt_dac) static int radeon_crt_is_connected(struct radeonfb_info *rinfo, int is_crt_dac)
{ {
int connected = 0; int connected = 0;
@ -369,7 +369,7 @@ static int __devinit radeon_crt_is_connected(struct radeonfb_info *rinfo, int is
* Parse the "monitor_layout" string if any. This code is mostly * Parse the "monitor_layout" string if any. This code is mostly
* copied from XFree's radeon driver * copied from XFree's radeon driver
*/ */
static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo, static int radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
const char *monitor_layout) const char *monitor_layout)
{ {
char s1[5], s2[5]; char s1[5], s2[5];
@ -433,7 +433,7 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
* try to retrieve EDID. The algorithm here comes from XFree's radeon * try to retrieve EDID. The algorithm here comes from XFree's radeon
* driver * driver
*/ */
void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, void radeon_probe_screens(struct radeonfb_info *rinfo,
const char *monitor_layout, int ignore_edid) const char *monitor_layout, int ignore_edid)
{ {
#ifdef CONFIG_FB_RADEON_I2C #ifdef CONFIG_FB_RADEON_I2C
@ -753,7 +753,7 @@ static int is_powerblade(const char *model)
* Build the modedb for head 1 (head 2 will come later), check panel infos * Build the modedb for head 1 (head 2 will come later), check panel infos
* from either BIOS or EDID, and pick up the default mode * from either BIOS or EDID, and pick up the default mode
*/ */
void __devinit radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_option) void radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_option)
{ {
struct fb_info * info = rinfo->info; struct fb_info * info = rinfo->info;
int has_default_mode = 0; int has_default_mode = 0;

6
drivers/video/au1100fb.c
View File

@ -83,7 +83,7 @@ struct fb_bitfield rgb_bitfields[][4] =
{ { 8, 4, 0 }, { 4, 4, 0 }, { 0, 4, 0 }, { 0, 0, 0 } }, { { 8, 4, 0 }, { 4, 4, 0 }, { 0, 4, 0 }, { 0, 0, 0 } },
}; };
static struct fb_fix_screeninfo au1100fb_fix __devinitdata = { static struct fb_fix_screeninfo au1100fb_fix = {
.id = "AU1100 FB", .id = "AU1100 FB",
.xpanstep = 1, .xpanstep = 1,
.ypanstep = 1, .ypanstep = 1,
@ -91,7 +91,7 @@ static struct fb_fix_screeninfo au1100fb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo au1100fb_var __devinitdata = { static struct fb_var_screeninfo au1100fb_var = {
.activate = FB_ACTIVATE_NOW, .activate = FB_ACTIVATE_NOW,
.height = -1, .height = -1,
.width = -1, .width = -1,
@ -469,7 +469,7 @@ static int au1100fb_setup(struct au1100fb_device *fbdev)
return 0; return 0;
} }
static int __devinit au1100fb_drv_probe(struct platform_device *dev) static int au1100fb_drv_probe(struct platform_device *dev)
{ {
struct au1100fb_device *fbdev = NULL; struct au1100fb_device *fbdev = NULL;
struct resource *regs_res; struct resource *regs_res;

6
drivers/video/au1200fb.c
View File

@ -1673,7 +1673,7 @@ out:
} }
/* AU1200 LCD controller device driver */ /* AU1200 LCD controller device driver */
static int __devinit au1200fb_drv_probe(struct platform_device *dev) static int au1200fb_drv_probe(struct platform_device *dev)
{ {
struct au1200fb_device *fbdev; struct au1200fb_device *fbdev;
struct au1200fb_platdata *pd; struct au1200fb_platdata *pd;
@ -1798,7 +1798,7 @@ failed:
return ret; return ret;
} }
static int __devexit au1200fb_drv_remove(struct platform_device *dev) static int au1200fb_drv_remove(struct platform_device *dev)
{ {
struct au1200fb_platdata *pd = platform_get_drvdata(dev); struct au1200fb_platdata *pd = platform_get_drvdata(dev);
struct au1200fb_device *fbdev; struct au1200fb_device *fbdev;
@ -1876,7 +1876,7 @@ static struct platform_driver au1200fb_driver = {
.pm = AU1200FB_PMOPS, .pm = AU1200FB_PMOPS,
}, },
.probe = au1200fb_drv_probe, .probe = au1200fb_drv_probe,
.remove = __devexit_p(au1200fb_drv_remove), .remove = au1200fb_drv_remove,
}; };
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/

6
drivers/video/auo_k1900fb.c
View File

@ -156,7 +156,7 @@ static bool auok1900fb_need_refresh(struct auok190xfb_par *par)
return (par->update_cnt > 10); return (par->update_cnt > 10);
} }
static int __devinit auok1900fb_probe(struct platform_device *pdev) static int auok1900fb_probe(struct platform_device *pdev)
{ {
struct auok190x_init_data init; struct auok190x_init_data init;
struct auok190x_board *board; struct auok190x_board *board;
@ -177,14 +177,14 @@ static int __devinit auok1900fb_probe(struct platform_device *pdev)
return auok190x_common_probe(pdev, &init); return auok190x_common_probe(pdev, &init);
} }
static int __devexit auok1900fb_remove(struct platform_device *pdev) static int auok1900fb_remove(struct platform_device *pdev)
{ {
return auok190x_common_remove(pdev); return auok190x_common_remove(pdev);
} }
static struct platform_driver auok1900fb_driver = { static struct platform_driver auok1900fb_driver = {
.probe = auok1900fb_probe, .probe = auok1900fb_probe,
.remove = __devexit_p(auok1900fb_remove), .remove = auok1900fb_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "auo_k1900fb", .name = "auo_k1900fb",

6
drivers/video/auo_k1901fb.c
View File

@ -209,7 +209,7 @@ static bool auok1901fb_need_refresh(struct auok190xfb_par *par)
return (par->update_cnt > 10); return (par->update_cnt > 10);
} }
static int __devinit auok1901fb_probe(struct platform_device *pdev) static int auok1901fb_probe(struct platform_device *pdev)
{ {
struct auok190x_init_data init; struct auok190x_init_data init;
struct auok190x_board *board; struct auok190x_board *board;
@ -230,14 +230,14 @@ static int __devinit auok1901fb_probe(struct platform_device *pdev)
return auok190x_common_probe(pdev, &init); return auok190x_common_probe(pdev, &init);
} }
static int __devexit auok1901fb_remove(struct platform_device *pdev) static int auok1901fb_remove(struct platform_device *pdev)
{ {
return auok190x_common_remove(pdev); return auok190x_common_remove(pdev);
} }
static struct platform_driver auok1901fb_driver = { static struct platform_driver auok1901fb_driver = {
.probe = auok1901fb_probe, .probe = auok1901fb_probe,
.remove = __devexit_p(auok1901fb_remove), .remove = auok1901fb_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "auo_k1901fb", .name = "auo_k1901fb",

4
drivers/video/auo_k190x.c
View File

@ -773,7 +773,7 @@ EXPORT_SYMBOL_GPL(auok190x_pm);
* Common probe and remove code * Common probe and remove code
*/ */
int __devinit auok190x_common_probe(struct platform_device *pdev, int auok190x_common_probe(struct platform_device *pdev,
struct auok190x_init_data *init) struct auok190x_init_data *init)
{ {
struct auok190x_board *board = init->board; struct auok190x_board *board = init->board;
@ -1006,7 +1006,7 @@ err_reg:
} }
EXPORT_SYMBOL_GPL(auok190x_common_probe); EXPORT_SYMBOL_GPL(auok190x_common_probe);
int __devexit auok190x_common_remove(struct platform_device *pdev) int auok190x_common_remove(struct platform_device *pdev)
{ {
struct fb_info *info = platform_get_drvdata(pdev); struct fb_info *info = platform_get_drvdata(pdev);
struct auok190xfb_par *par = info->par; struct auok190xfb_par *par = info->par;

16
drivers/video/bf537-lq035.c
View File

@ -87,7 +87,7 @@ static void set_vcomm(void)
pr_err("i2c_smbus_write_byte_data fail: %d\n", nr); pr_err("i2c_smbus_write_byte_data fail: %d\n", nr);
} }
static int __devinit ad5280_probe(struct i2c_client *client, static int ad5280_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int ret; int ret;
@ -108,7 +108,7 @@ static int __devinit ad5280_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit ad5280_remove(struct i2c_client *client) static int ad5280_remove(struct i2c_client *client)
{ {
ad5280_client = NULL; ad5280_client = NULL;
return 0; return 0;
@ -126,7 +126,7 @@ static struct i2c_driver ad5280_driver = {
.name = "bf537-lq035-ad5280", .name = "bf537-lq035-ad5280",
}, },
.probe = ad5280_probe, .probe = ad5280_probe,
.remove = __devexit_p(ad5280_remove), .remove = ad5280_remove,
.id_table = ad5280_id, .id_table = ad5280_id,
}; };
@ -360,7 +360,7 @@ static int config_dma(void)
return 0; return 0;
} }
static int __devinit request_ports(void) static int request_ports(void)
{ {
u16 tmr_req[] = TIMERS; u16 tmr_req[] = TIMERS;
@ -443,7 +443,7 @@ static struct fb_var_screeninfo bfin_lq035_fb_defined = {
.transp = {0, 0, 0}, .transp = {0, 0, 0},
}; };
static struct fb_fix_screeninfo bfin_lq035_fb_fix __devinitdata = { static struct fb_fix_screeninfo bfin_lq035_fb_fix = {
.id = KBUILD_MODNAME, .id = KBUILD_MODNAME,
.smem_len = ACTIVE_VIDEO_MEM_SIZE, .smem_len = ACTIVE_VIDEO_MEM_SIZE,
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
@ -686,7 +686,7 @@ static struct lcd_ops bfin_lcd_ops = {
static struct lcd_device *lcd_dev; static struct lcd_device *lcd_dev;
static int __devinit bfin_lq035_probe(struct platform_device *pdev) static int bfin_lq035_probe(struct platform_device *pdev)
{ {
struct backlight_properties props; struct backlight_properties props;
dma_addr_t dma_handle; dma_addr_t dma_handle;
@ -816,7 +816,7 @@ out_ports:
return ret; return ret;
} }
static int __devexit bfin_lq035_remove(struct platform_device *pdev) static int bfin_lq035_remove(struct platform_device *pdev)
{ {
if (fb_buffer != NULL) if (fb_buffer != NULL)
dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0); dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
@ -889,7 +889,7 @@ static int bfin_lq035_resume(struct platform_device *pdev)
static struct platform_driver bfin_lq035_driver = { static struct platform_driver bfin_lq035_driver = {
.probe = bfin_lq035_probe, .probe = bfin_lq035_probe,
.remove = __devexit_p(bfin_lq035_remove), .remove = bfin_lq035_remove,
.suspend = bfin_lq035_suspend, .suspend = bfin_lq035_suspend,
.resume = bfin_lq035_resume, .resume = bfin_lq035_resume,
.driver = { .driver = {

6
drivers/video/bf54x-lq043fb.c
View File

@ -497,7 +497,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit bfin_bf54x_probe(struct platform_device *pdev) static int bfin_bf54x_probe(struct platform_device *pdev)
{ {
#ifndef NO_BL_SUPPORT #ifndef NO_BL_SUPPORT
struct backlight_properties props; struct backlight_properties props;
@ -686,7 +686,7 @@ out1:
return ret; return ret;
} }
static int __devexit bfin_bf54x_remove(struct platform_device *pdev) static int bfin_bf54x_remove(struct platform_device *pdev)
{ {
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
@ -754,7 +754,7 @@ static int bfin_bf54x_resume(struct platform_device *pdev)
static struct platform_driver bfin_bf54x_driver = { static struct platform_driver bfin_bf54x_driver = {
.probe = bfin_bf54x_probe, .probe = bfin_bf54x_probe,
.remove = __devexit_p(bfin_bf54x_remove), .remove = bfin_bf54x_remove,
.suspend = bfin_bf54x_suspend, .suspend = bfin_bf54x_suspend,
.resume = bfin_bf54x_resume, .resume = bfin_bf54x_resume,
.driver = { .driver = {

12
drivers/video/bfin-lq035q1-fb.c
View File

@ -137,7 +137,7 @@ static int lq035q1_control(struct spi_device *spi, unsigned char reg, unsigned s
return ret; return ret;
} }
static int __devinit lq035q1_spidev_probe(struct spi_device *spi) static int lq035q1_spidev_probe(struct spi_device *spi)
{ {
int ret; int ret;
struct spi_control *ctl; struct spi_control *ctl;
@ -358,7 +358,7 @@ static inline void bfin_lq035q1_free_ports(unsigned ppi16)
gpio_free(P_IDENT(P_PPI0_FS3)); gpio_free(P_IDENT(P_PPI0_FS3));
} }
static int __devinit bfin_lq035q1_request_ports(struct platform_device *pdev, static int bfin_lq035q1_request_ports(struct platform_device *pdev,
unsigned ppi16) unsigned ppi16)
{ {
int ret; int ret;
@ -555,7 +555,7 @@ static irqreturn_t bfin_lq035q1_irq_error(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit bfin_lq035q1_probe(struct platform_device *pdev) static int bfin_lq035q1_probe(struct platform_device *pdev)
{ {
struct bfin_lq035q1fb_info *info; struct bfin_lq035q1fb_info *info;
struct fb_info *fbinfo; struct fb_info *fbinfo;
@ -706,7 +706,7 @@ static int __devinit bfin_lq035q1_probe(struct platform_device *pdev)
info->spidrv.driver.name = DRIVER_NAME"-spi"; info->spidrv.driver.name = DRIVER_NAME"-spi";
info->spidrv.probe = lq035q1_spidev_probe; info->spidrv.probe = lq035q1_spidev_probe;
info->spidrv.remove = __devexit_p(lq035q1_spidev_remove); info->spidrv.remove = lq035q1_spidev_remove;
info->spidrv.shutdown = lq035q1_spidev_shutdown; info->spidrv.shutdown = lq035q1_spidev_shutdown;
info->spidrv.suspend = lq035q1_spidev_suspend; info->spidrv.suspend = lq035q1_spidev_suspend;
info->spidrv.resume = lq035q1_spidev_resume; info->spidrv.resume = lq035q1_spidev_resume;
@ -764,7 +764,7 @@ static int __devinit bfin_lq035q1_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit bfin_lq035q1_remove(struct platform_device *pdev) static int bfin_lq035q1_remove(struct platform_device *pdev)
{ {
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
struct bfin_lq035q1fb_info *info = fbinfo->par; struct bfin_lq035q1fb_info *info = fbinfo->par;
@ -845,7 +845,7 @@ static struct dev_pm_ops bfin_lq035q1_dev_pm_ops = {
static struct platform_driver bfin_lq035q1_driver = { static struct platform_driver bfin_lq035q1_driver = {
.probe = bfin_lq035q1_probe, .probe = bfin_lq035q1_probe,
.remove = __devexit_p(bfin_lq035q1_remove), .remove = bfin_lq035q1_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
#ifdef CONFIG_PM #ifdef CONFIG_PM

6
drivers/video/bfin-t350mcqb-fb.c
View File

@ -418,7 +418,7 @@ static irqreturn_t bfin_t350mcqb_irq_error(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) static int bfin_t350mcqb_probe(struct platform_device *pdev)
{ {
#ifndef NO_BL_SUPPORT #ifndef NO_BL_SUPPORT
struct backlight_properties props; struct backlight_properties props;
@ -583,7 +583,7 @@ out1:
return ret; return ret;
} }
static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev) static int bfin_t350mcqb_remove(struct platform_device *pdev)
{ {
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
@ -658,7 +658,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev)
static struct platform_driver bfin_t350mcqb_driver = { static struct platform_driver bfin_t350mcqb_driver = {
.probe = bfin_t350mcqb_probe, .probe = bfin_t350mcqb_probe,
.remove = __devexit_p(bfin_t350mcqb_remove), .remove = bfin_t350mcqb_remove,
.suspend = bfin_t350mcqb_suspend, .suspend = bfin_t350mcqb_suspend,
.resume = bfin_t350mcqb_resume, .resume = bfin_t350mcqb_resume,
.driver = { .driver = {

8
drivers/video/bfin_adv7393fb.c
View File

@ -88,7 +88,7 @@ static struct fb_var_screeninfo bfin_adv7393_fb_defined = {
.transp = {0, 0, 0}, .transp = {0, 0, 0},
}; };
static struct fb_fix_screeninfo bfin_adv7393_fb_fix __devinitdata = { static struct fb_fix_screeninfo bfin_adv7393_fb_fix = {
.id = "BFIN ADV7393", .id = "BFIN ADV7393",
.smem_len = 720 * 480 * 2, .smem_len = 720 * 480 * 2,
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
@ -368,7 +368,7 @@ adv7393_write_proc(struct file *file, const char __user * buffer,
return count; return count;
} }
static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client, static int bfin_adv7393_fb_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int ret = 0; int ret = 0;
@ -719,7 +719,7 @@ static int bfin_adv7393_fb_setcolreg(u_int regno, u_int red, u_int green,
return 0; return 0;
} }
static int __devexit bfin_adv7393_fb_remove(struct i2c_client *client) static int bfin_adv7393_fb_remove(struct i2c_client *client)
{ {
struct adv7393fb_device *fbdev = i2c_get_clientdata(client); struct adv7393fb_device *fbdev = i2c_get_clientdata(client);
@ -794,7 +794,7 @@ static struct i2c_driver bfin_adv7393_fb_driver = {
#endif #endif
}, },
.probe = bfin_adv7393_fb_probe, .probe = bfin_adv7393_fb_probe,
.remove = __devexit_p(bfin_adv7393_fb_remove), .remove = bfin_adv7393_fb_remove,
.id_table = bfin_adv7393_id, .id_table = bfin_adv7393_id,
}; };

16
drivers/video/broadsheetfb.c
View File

@ -91,7 +91,7 @@ static struct panel_info panel_table[] = {
#define DPY_W 800 #define DPY_W 800
#define DPY_H 600 #define DPY_H 600
static struct fb_fix_screeninfo broadsheetfb_fix __devinitdata = { static struct fb_fix_screeninfo broadsheetfb_fix = {
.id = "broadsheetfb", .id = "broadsheetfb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_STATIC_PSEUDOCOLOR, .visual = FB_VISUAL_STATIC_PSEUDOCOLOR,
@ -102,7 +102,7 @@ static struct fb_fix_screeninfo broadsheetfb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo broadsheetfb_var __devinitdata = { static struct fb_var_screeninfo broadsheetfb_var = {
.xres = DPY_W, .xres = DPY_W,
.yres = DPY_H, .yres = DPY_H,
.xres_virtual = DPY_W, .xres_virtual = DPY_W,
@ -774,7 +774,7 @@ static DEVICE_ATTR(loadstore_waveform, S_IWUSR, NULL,
broadsheet_loadstore_waveform); broadsheet_loadstore_waveform);
/* upper level functions that manipulate the display and other stuff */ /* upper level functions that manipulate the display and other stuff */
static void __devinit broadsheet_init_display(struct broadsheetfb_par *par) static void broadsheet_init_display(struct broadsheetfb_par *par)
{ {
u16 args[5]; u16 args[5];
int xres = par->info->var.xres; int xres = par->info->var.xres;
@ -834,7 +834,7 @@ static void __devinit broadsheet_init_display(struct broadsheetfb_par *par)
par->board->wait_for_rdy(par); par->board->wait_for_rdy(par);
} }
static void __devinit broadsheet_identify(struct broadsheetfb_par *par) static void broadsheet_identify(struct broadsheetfb_par *par)
{ {
u16 rev, prc; u16 rev, prc;
struct device *dev = par->info->device; struct device *dev = par->info->device;
@ -849,7 +849,7 @@ static void __devinit broadsheet_identify(struct broadsheetfb_par *par)
dev_warn(dev, "Unrecognized Broadsheet Revision\n"); dev_warn(dev, "Unrecognized Broadsheet Revision\n");
} }
static void __devinit broadsheet_init(struct broadsheetfb_par *par) static void broadsheet_init(struct broadsheetfb_par *par)
{ {
broadsheet_send_command(par, BS_CMD_INIT_SYS_RUN); broadsheet_send_command(par, BS_CMD_INIT_SYS_RUN);
/* the controller needs a second */ /* the controller needs a second */
@ -1058,7 +1058,7 @@ static struct fb_deferred_io broadsheetfb_defio = {
.deferred_io = broadsheetfb_dpy_deferred_io, .deferred_io = broadsheetfb_dpy_deferred_io,
}; };
static int __devinit broadsheetfb_probe(struct platform_device *dev) static int broadsheetfb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
struct broadsheet_board *board; struct broadsheet_board *board;
@ -1190,7 +1190,7 @@ err:
} }
static int __devexit broadsheetfb_remove(struct platform_device *dev) static int broadsheetfb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev)
static struct platform_driver broadsheetfb_driver = { static struct platform_driver broadsheetfb_driver = {
.probe = broadsheetfb_probe, .probe = broadsheetfb_probe,
.remove = __devexit_p(broadsheetfb_remove), .remove = broadsheetfb_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "broadsheetfb", .name = "broadsheetfb",

21
drivers/video/bw2.c
View File

@ -179,7 +179,7 @@ static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
* Initialisation * Initialisation
*/ */
static void __devinit bw2_init_fix(struct fb_info *info, int linebytes) static void bw2_init_fix(struct fb_info *info, int linebytes)
{ {
strlcpy(info->fix.id, "bwtwo", sizeof(info->fix.id)); strlcpy(info->fix.id, "bwtwo", sizeof(info->fix.id));
@ -191,43 +191,42 @@ static void __devinit bw2_init_fix(struct fb_info *info, int linebytes)
info->fix.accel = FB_ACCEL_SUN_BWTWO; info->fix.accel = FB_ACCEL_SUN_BWTWO;
} }
static u8 bw2regs_1600[] __devinitdata = { static u8 bw2regs_1600[] = {
0x14, 0x8b, 0x15, 0x28, 0x16, 0x03, 0x17, 0x13, 0x14, 0x8b, 0x15, 0x28, 0x16, 0x03, 0x17, 0x13,
0x18, 0x7b, 0x19, 0x05, 0x1a, 0x34, 0x1b, 0x2e, 0x18, 0x7b, 0x19, 0x05, 0x1a, 0x34, 0x1b, 0x2e,
0x1c, 0x00, 0x1d, 0x0a, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x00, 0x1d, 0x0a, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x21, 0 0x10, 0x21, 0
}; };
static u8 bw2regs_ecl[] __devinitdata = { static u8 bw2regs_ecl[] = {
0x14, 0x65, 0x15, 0x1e, 0x16, 0x04, 0x17, 0x0c, 0x14, 0x65, 0x15, 0x1e, 0x16, 0x04, 0x17, 0x0c,
0x18, 0x5e, 0x19, 0x03, 0x1a, 0xa7, 0x1b, 0x23, 0x18, 0x5e, 0x19, 0x03, 0x1a, 0xa7, 0x1b, 0x23,
0x1c, 0x00, 0x1d, 0x08, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x00, 0x1d, 0x08, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x20, 0 0x10, 0x20, 0
}; };
static u8 bw2regs_analog[] __devinitdata = { static u8 bw2regs_analog[] = {
0x14, 0xbb, 0x15, 0x2b, 0x16, 0x03, 0x17, 0x13, 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x03, 0x17, 0x13,
0x18, 0xb0, 0x19, 0x03, 0x1a, 0xa6, 0x1b, 0x22, 0x18, 0xb0, 0x19, 0x03, 0x1a, 0xa6, 0x1b, 0x22,
0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x20, 0 0x10, 0x20, 0
}; };
static u8 bw2regs_76hz[] __devinitdata = { static u8 bw2regs_76hz[] = {
0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f, 0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f,
0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a, 0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a,
0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x24, 0 0x10, 0x24, 0
}; };
static u8 bw2regs_66hz[] __devinitdata = { static u8 bw2regs_66hz[] = {
0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14, 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14,
0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24, 0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24,
0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x20, 0 0x10, 0x20, 0
}; };
static int __devinit bw2_do_default_mode(struct bw2_par *par, static int bw2_do_default_mode(struct bw2_par *par, struct fb_info *info,
struct fb_info *info,
int *linebytes) int *linebytes)
{ {
u8 status, mon; u8 status, mon;
@ -273,7 +272,7 @@ static int __devinit bw2_do_default_mode(struct bw2_par *par,
return 0; return 0;
} }
static int __devinit bw2_probe(struct platform_device *op) static int bw2_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -352,7 +351,7 @@ out_err:
return err; return err;
} }
static int __devexit bw2_remove(struct platform_device *op) static int bw2_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct bw2_par *par = info->par; struct bw2_par *par = info->par;
@ -384,7 +383,7 @@ static struct platform_driver bw2_driver = {
.of_match_table = bw2_match, .of_match_table = bw2_match,
}, },
.probe = bw2_probe, .probe = bw2_probe,
.remove = __devexit_p(bw2_remove), .remove = bw2_remove,
}; };
static int __init bw2_init(void) static int __init bw2_init(void)

16
drivers/video/carminefb.c
View File

@ -78,7 +78,7 @@ struct carmine_fb {
u32 pseudo_palette[16]; u32 pseudo_palette[16];
}; };
static struct fb_fix_screeninfo carminefb_fix __devinitdata = { static struct fb_fix_screeninfo carminefb_fix = {
.id = "Carmine", .id = "Carmine",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
@ -537,8 +537,9 @@ static struct fb_ops carminefb_ops = {
.fb_setcolreg = carmine_setcolreg, .fb_setcolreg = carmine_setcolreg,
}; };
static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base, static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
int smem_offset, struct device *device, struct fb_info **rinfo) int smem_offset, struct device *device,
struct fb_info **rinfo)
{ {
int ret; int ret;
struct fb_info *info; struct fb_info *info;
@ -606,8 +607,7 @@ static void cleanup_fb_device(struct fb_info *info)
} }
} }
static int __devinit carminefb_probe(struct pci_dev *dev, static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct carmine_hw *hw; struct carmine_hw *hw;
struct device *device = &dev->dev; struct device *device = &dev->dev;
@ -721,7 +721,7 @@ err_enable_pci:
return ret; return ret;
} }
static void __devexit carminefb_remove(struct pci_dev *dev) static void carminefb_remove(struct pci_dev *dev)
{ {
struct carmine_hw *hw = pci_get_drvdata(dev); struct carmine_hw *hw = pci_get_drvdata(dev);
struct fb_fix_screeninfo fix; struct fb_fix_screeninfo fix;
@ -752,7 +752,7 @@ static void __devexit carminefb_remove(struct pci_dev *dev)
} }
#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf #define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf
static struct pci_device_id carmine_devices[] __devinitdata = { static struct pci_device_id carmine_devices[] = {
{ {
PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)}, PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)},
{0, 0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0, 0}
@ -764,7 +764,7 @@ static struct pci_driver carmine_pci_driver = {
.name = "carminefb", .name = "carminefb",
.id_table = carmine_devices, .id_table = carmine_devices,
.probe = carminefb_probe, .probe = carminefb_probe,
.remove = __devexit_p(carminefb_remove), .remove = carminefb_remove,
}; };
static int __init carminefb_init(void) static int __init carminefb_init(void)

10
drivers/video/cg14.c
View File

@ -352,7 +352,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
* Initialisation * Initialisation
*/ */
static void __devinit cg14_init_fix(struct fb_info *info, int linebytes, static void cg14_init_fix(struct fb_info *info, int linebytes,
struct device_node *dp) struct device_node *dp)
{ {
const char *name = dp->name; const char *name = dp->name;
@ -367,7 +367,7 @@ static void __devinit cg14_init_fix(struct fb_info *info, int linebytes,
info->fix.accel = FB_ACCEL_SUN_CG14; info->fix.accel = FB_ACCEL_SUN_CG14;
} }
static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __devinitdata = { static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {
{ {
.voff = CG14_REGS, .voff = CG14_REGS,
.poff = 0x80000000, .poff = 0x80000000,
@ -463,7 +463,7 @@ static void cg14_unmap_regs(struct platform_device *op, struct fb_info *info,
info->screen_base, info->fix.smem_len); info->screen_base, info->fix.smem_len);
} }
static int __devinit cg14_probe(struct platform_device *op) static int cg14_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -571,7 +571,7 @@ out_err:
return err; return err;
} }
static int __devexit cg14_remove(struct platform_device *op) static int cg14_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct cg14_par *par = info->par; struct cg14_par *par = info->par;
@ -603,7 +603,7 @@ static struct platform_driver cg14_driver = {
.of_match_table = cg14_match, .of_match_table = cg14_match,
}, },
.probe = cg14_probe, .probe = cg14_probe,
.remove = __devexit_p(cg14_remove), .remove = cg14_remove,
}; };
static int __init cg14_init(void) static int __init cg14_init(void)

22
drivers/video/cg3.c
View File

@ -243,7 +243,7 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
* Initialisation * Initialisation
*/ */
static void __devinit cg3_init_fix(struct fb_info *info, int linebytes, static void cg3_init_fix(struct fb_info *info, int linebytes,
struct device_node *dp) struct device_node *dp)
{ {
strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
@ -256,7 +256,7 @@ static void __devinit cg3_init_fix(struct fb_info *info, int linebytes,
info->fix.accel = FB_ACCEL_SUN_CGTHREE; info->fix.accel = FB_ACCEL_SUN_CGTHREE;
} }
static void __devinit cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var, static void cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,
struct device_node *dp) struct device_node *dp)
{ {
const char *params; const char *params;
@ -279,36 +279,36 @@ static void __devinit cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,
} }
} }
static u8 cg3regvals_66hz[] __devinitdata = { /* 1152 x 900, 66 Hz */ static u8 cg3regvals_66hz[] = { /* 1152 x 900, 66 Hz */
0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14, 0x14, 0xbb, 0x15, 0x2b, 0x16, 0x04, 0x17, 0x14,
0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24, 0x18, 0xae, 0x19, 0x03, 0x1a, 0xa8, 0x1b, 0x24,
0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x01, 0x1d, 0x05, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x20, 0 0x10, 0x20, 0
}; };
static u8 cg3regvals_76hz[] __devinitdata = { /* 1152 x 900, 76 Hz */ static u8 cg3regvals_76hz[] = { /* 1152 x 900, 76 Hz */
0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f, 0x14, 0xb7, 0x15, 0x27, 0x16, 0x03, 0x17, 0x0f,
0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a, 0x18, 0xae, 0x19, 0x03, 0x1a, 0xae, 0x1b, 0x2a,
0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x01, 0x1d, 0x09, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x24, 0 0x10, 0x24, 0
}; };
static u8 cg3regvals_rdi[] __devinitdata = { /* 640 x 480, cgRDI */ static u8 cg3regvals_rdi[] = { /* 640 x 480, cgRDI */
0x14, 0x70, 0x15, 0x20, 0x16, 0x08, 0x17, 0x10, 0x14, 0x70, 0x15, 0x20, 0x16, 0x08, 0x17, 0x10,
0x18, 0x06, 0x19, 0x02, 0x1a, 0x31, 0x1b, 0x51, 0x18, 0x06, 0x19, 0x02, 0x1a, 0x31, 0x1b, 0x51,
0x1c, 0x06, 0x1d, 0x0c, 0x1e, 0xff, 0x1f, 0x01, 0x1c, 0x06, 0x1d, 0x0c, 0x1e, 0xff, 0x1f, 0x01,
0x10, 0x22, 0 0x10, 0x22, 0
}; };
static u8 *cg3_regvals[] __devinitdata = { static u8 *cg3_regvals[] = {
cg3regvals_66hz, cg3regvals_76hz, cg3regvals_rdi cg3regvals_66hz, cg3regvals_76hz, cg3regvals_rdi
}; };
static u_char cg3_dacvals[] __devinitdata = { static u_char cg3_dacvals[] = {
4, 0xff, 5, 0x00, 6, 0x70, 7, 0x00, 0 4, 0xff, 5, 0x00, 6, 0x70, 7, 0x00, 0
}; };
static int __devinit cg3_do_default_mode(struct cg3_par *par) static int cg3_do_default_mode(struct cg3_par *par)
{ {
enum cg3_type type; enum cg3_type type;
u8 *p; u8 *p;
@ -346,7 +346,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par)
return 0; return 0;
} }
static int __devinit cg3_probe(struct platform_device *op) static int cg3_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -433,7 +433,7 @@ out_err:
return err; return err;
} }
static int __devexit cg3_remove(struct platform_device *op) static int cg3_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct cg3_par *par = info->par; struct cg3_par *par = info->par;
@ -469,7 +469,7 @@ static struct platform_driver cg3_driver = {
.of_match_table = cg3_match, .of_match_table = cg3_match,
}, },
.probe = cg3_probe, .probe = cg3_probe,
.remove = __devexit_p(cg3_remove), .remove = cg3_remove,
}; };
static int __init cg3_init(void) static int __init cg3_init(void)

12
drivers/video/cg6.c
View File

@ -607,7 +607,7 @@ static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
* Initialisation * Initialisation
*/ */
static void __devinit cg6_init_fix(struct fb_info *info, int linebytes) static void cg6_init_fix(struct fb_info *info, int linebytes)
{ {
struct cg6_par *par = (struct cg6_par *)info->par; struct cg6_par *par = (struct cg6_par *)info->par;
const char *cg6_cpu_name, *cg6_card_name; const char *cg6_cpu_name, *cg6_card_name;
@ -649,7 +649,7 @@ static void __devinit cg6_init_fix(struct fb_info *info, int linebytes)
} }
/* Initialize Brooktree DAC */ /* Initialize Brooktree DAC */
static void __devinit cg6_bt_init(struct cg6_par *par) static void cg6_bt_init(struct cg6_par *par)
{ {
struct bt_regs __iomem *bt = par->bt; struct bt_regs __iomem *bt = par->bt;
@ -663,7 +663,7 @@ static void __devinit cg6_bt_init(struct cg6_par *par)
sbus_writel(0x00 << 24, &bt->control); sbus_writel(0x00 << 24, &bt->control);
} }
static void __devinit cg6_chip_init(struct fb_info *info) static void cg6_chip_init(struct fb_info *info)
{ {
struct cg6_par *par = (struct cg6_par *)info->par; struct cg6_par *par = (struct cg6_par *)info->par;
struct cg6_tec __iomem *tec = par->tec; struct cg6_tec __iomem *tec = par->tec;
@ -737,7 +737,7 @@ static void cg6_unmap_regs(struct platform_device *op, struct fb_info *info,
info->fix.smem_len); info->fix.smem_len);
} }
static int __devinit cg6_probe(struct platform_device *op) static int cg6_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -827,7 +827,7 @@ out_err:
return err; return err;
} }
static int __devexit cg6_remove(struct platform_device *op) static int cg6_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct cg6_par *par = info->par; struct cg6_par *par = info->par;
@ -862,7 +862,7 @@ static struct platform_driver cg6_driver = {
.of_match_table = cg6_match, .of_match_table = cg6_match,
}, },
.probe = cg6_probe, .probe = cg6_probe,
.remove = __devexit_p(cg6_remove), .remove = cg6_remove,
}; };
static int __init cg6_init(void) static int __init cg6_init(void)

13
drivers/video/chipsfb.c
View File

@ -292,7 +292,7 @@ static void __init chips_hw_init(void)
write_fr(chips_init_fr[i].addr, chips_init_fr[i].data); write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
} }
static struct fb_fix_screeninfo chipsfb_fix __devinitdata = { static struct fb_fix_screeninfo chipsfb_fix = {
.id = "C&T 65550", .id = "C&T 65550",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -309,7 +309,7 @@ static struct fb_fix_screeninfo chipsfb_fix __devinitdata = {
.smem_len = 0x100000, /* 1MB */ .smem_len = 0x100000, /* 1MB */
}; };
static struct fb_var_screeninfo chipsfb_var __devinitdata = { static struct fb_var_screeninfo chipsfb_var = {
.xres = 800, .xres = 800,
.yres = 600, .yres = 600,
.xres_virtual = 800, .xres_virtual = 800,
@ -330,7 +330,7 @@ static struct fb_var_screeninfo chipsfb_var __devinitdata = {
.vsync_len = 8, .vsync_len = 8,
}; };
static void __devinit init_chips(struct fb_info *p, unsigned long addr) static void init_chips(struct fb_info *p, unsigned long addr)
{ {
memset(p->screen_base, 0, 0x100000); memset(p->screen_base, 0, 0x100000);
@ -347,8 +347,7 @@ static void __devinit init_chips(struct fb_info *p, unsigned long addr)
chips_hw_init(); chips_hw_init();
} }
static int __devinit static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
{ {
struct fb_info *p; struct fb_info *p;
unsigned long addr, size; unsigned long addr, size;
@ -438,7 +437,7 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
return rc; return rc;
} }
static void __devexit chipsfb_remove(struct pci_dev *dp) static void chipsfb_remove(struct pci_dev *dp)
{ {
struct fb_info *p = pci_get_drvdata(dp); struct fb_info *p = pci_get_drvdata(dp);
@ -495,7 +494,7 @@ static struct pci_driver chipsfb_driver = {
.name = "chipsfb", .name = "chipsfb",
.id_table = chipsfb_pci_tbl, .id_table = chipsfb_pci_tbl,
.probe = chipsfb_pci_init, .probe = chipsfb_pci_init,
.remove = __devexit_p(chipsfb_remove), .remove = chipsfb_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = chipsfb_pci_suspend, .suspend = chipsfb_pci_suspend,
.resume = chipsfb_pci_resume, .resume = chipsfb_pci_resume,

38
drivers/video/cirrusfb.c
View File

@ -290,34 +290,34 @@ struct zorrocl {
zorro_id ramid2; /* Zorro ID of optional second RAM device */ zorro_id ramid2; /* Zorro ID of optional second RAM device */
}; };
static const struct zorrocl zcl_sd64 __devinitconst = { static const struct zorrocl zcl_sd64 = {
.type = BT_SD64, .type = BT_SD64,
.ramid = ZORRO_PROD_HELFRICH_SD64_RAM, .ramid = ZORRO_PROD_HELFRICH_SD64_RAM,
}; };
static const struct zorrocl zcl_piccolo __devinitconst = { static const struct zorrocl zcl_piccolo = {
.type = BT_PICCOLO, .type = BT_PICCOLO,
.ramid = ZORRO_PROD_HELFRICH_PICCOLO_RAM, .ramid = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
}; };
static const struct zorrocl zcl_picasso __devinitconst = { static const struct zorrocl zcl_picasso = {
.type = BT_PICASSO, .type = BT_PICASSO,
.ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM, .ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
}; };
static const struct zorrocl zcl_spectrum __devinitconst = { static const struct zorrocl zcl_spectrum = {
.type = BT_SPECTRUM, .type = BT_SPECTRUM,
.ramid = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM, .ramid = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
}; };
static const struct zorrocl zcl_picasso4_z3 __devinitconst = { static const struct zorrocl zcl_picasso4_z3 = {
.type = BT_PICASSO4, .type = BT_PICASSO4,
.regoffset = 0x00600000, .regoffset = 0x00600000,
.ramsize = 4 * MB_, .ramsize = 4 * MB_,
.ramoffset = 0x01000000, /* 0x02000000 for 64 MiB boards */ .ramoffset = 0x01000000, /* 0x02000000 for 64 MiB boards */
}; };
static const struct zorrocl zcl_picasso4_z2 __devinitconst = { static const struct zorrocl zcl_picasso4_z2 = {
.type = BT_PICASSO4, .type = BT_PICASSO4,
.regoffset = 0x10000, .regoffset = 0x10000,
.ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1, .ramid = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1,
@ -325,7 +325,7 @@ static const struct zorrocl zcl_picasso4_z2 __devinitconst = {
}; };
static const struct zorro_device_id cirrusfb_zorro_table[] __devinitconst = { static const struct zorro_device_id cirrusfb_zorro_table[] = {
{ {
.id = ZORRO_PROD_HELFRICH_SD64_REG, .id = ZORRO_PROD_HELFRICH_SD64_REG,
.driver_data = (unsigned long)&zcl_sd64, .driver_data = (unsigned long)&zcl_sd64,
@ -372,8 +372,8 @@ struct cirrusfb_info {
void (*unmap)(struct fb_info *info); void (*unmap)(struct fb_info *info);
}; };
static bool noaccel __devinitdata; static bool noaccel;
static char *mode_option __devinitdata = "640x480@60"; static char *mode_option = "640x480@60";
/****************************************************************************/ /****************************************************************************/
/**** BEGIN PROTOTYPES ******************************************************/ /**** BEGIN PROTOTYPES ******************************************************/
@ -1892,7 +1892,7 @@ static int release_io_ports;
* based on the DRAM bandwidth bit and DRAM bank switching bit. This * based on the DRAM bandwidth bit and DRAM bank switching bit. This
* works with 1MB, 2MB and 4MB configurations (which the Motorola boards * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
* seem to have. */ * seem to have. */
static unsigned int __devinit cirrusfb_get_memsize(struct fb_info *info, static unsigned int cirrusfb_get_memsize(struct fb_info *info,
u8 __iomem *regbase) u8 __iomem *regbase)
{ {
unsigned long mem; unsigned long mem;
@ -2003,7 +2003,7 @@ static struct fb_ops cirrusfb_ops = {
.fb_imageblit = cirrusfb_imageblit, .fb_imageblit = cirrusfb_imageblit,
}; };
static int __devinit cirrusfb_set_fbinfo(struct fb_info *info) static int cirrusfb_set_fbinfo(struct fb_info *info)
{ {
struct cirrusfb_info *cinfo = info->par; struct cirrusfb_info *cinfo = info->par;
struct fb_var_screeninfo *var = &info->var; struct fb_var_screeninfo *var = &info->var;
@ -2052,7 +2052,7 @@ static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
return 0; return 0;
} }
static int __devinit cirrusfb_register(struct fb_info *info) static int cirrusfb_register(struct fb_info *info)
{ {
struct cirrusfb_info *cinfo = info->par; struct cirrusfb_info *cinfo = info->par;
int err; int err;
@ -2096,7 +2096,7 @@ err_dealloc_cmap:
return err; return err;
} }
static void __devexit cirrusfb_cleanup(struct fb_info *info) static void cirrusfb_cleanup(struct fb_info *info)
{ {
struct cirrusfb_info *cinfo = info->par; struct cirrusfb_info *cinfo = info->par;
@ -2109,7 +2109,7 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __devinit cirrusfb_pci_register(struct pci_dev *pdev, static int cirrusfb_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct cirrusfb_info *cinfo; struct cirrusfb_info *cinfo;
@ -2215,7 +2215,7 @@ err_out:
return ret; return ret;
} }
static void __devexit cirrusfb_pci_unregister(struct pci_dev *pdev) static void cirrusfb_pci_unregister(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
@ -2226,7 +2226,7 @@ static struct pci_driver cirrusfb_pci_driver = {
.name = "cirrusfb", .name = "cirrusfb",
.id_table = cirrusfb_pci_table, .id_table = cirrusfb_pci_table,
.probe = cirrusfb_pci_register, .probe = cirrusfb_pci_register,
.remove = __devexit_p(cirrusfb_pci_unregister), .remove = cirrusfb_pci_unregister,
#ifdef CONFIG_PM #ifdef CONFIG_PM
#if 0 #if 0
.suspend = cirrusfb_pci_suspend, .suspend = cirrusfb_pci_suspend,
@ -2237,7 +2237,7 @@ static struct pci_driver cirrusfb_pci_driver = {
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#ifdef CONFIG_ZORRO #ifdef CONFIG_ZORRO
static int __devinit cirrusfb_zorro_register(struct zorro_dev *z, static int cirrusfb_zorro_register(struct zorro_dev *z,
const struct zorro_device_id *ent) const struct zorro_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
@ -2352,7 +2352,7 @@ err_release_fb:
return error; return error;
} }
void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z) void cirrusfb_zorro_unregister(struct zorro_dev *z)
{ {
struct fb_info *info = zorro_get_drvdata(z); struct fb_info *info = zorro_get_drvdata(z);
@ -2364,7 +2364,7 @@ static struct zorro_driver cirrusfb_zorro_driver = {
.name = "cirrusfb", .name = "cirrusfb",
.id_table = cirrusfb_zorro_table, .id_table = cirrusfb_zorro_table,
.probe = cirrusfb_zorro_register, .probe = cirrusfb_zorro_register,
.remove = __devexit_p(cirrusfb_zorro_unregister), .remove = cirrusfb_zorro_unregister,
}; };
#endif /* CONFIG_ZORRO */ #endif /* CONFIG_ZORRO */

8
drivers/video/clps711xfb.c
View File

@ -178,7 +178,7 @@ static struct fb_ops clps7111fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static void __devinit clps711x_guess_lcd_params(struct fb_info *info) static void clps711x_guess_lcd_params(struct fb_info *info)
{ {
unsigned int lcdcon, syscon, size; unsigned int lcdcon, syscon, size;
unsigned long phys_base = PAGE_OFFSET; unsigned long phys_base = PAGE_OFFSET;
@ -266,7 +266,7 @@ static void __devinit clps711x_guess_lcd_params(struct fb_info *info)
info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.type = FB_TYPE_PACKED_PIXELS;
} }
static int __devinit clps711x_fb_probe(struct platform_device *pdev) static int clps711x_fb_probe(struct platform_device *pdev)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -291,7 +291,7 @@ static int __devinit clps711x_fb_probe(struct platform_device *pdev)
out: return err; out: return err;
} }
static int __devexit clps711x_fb_remove(struct platform_device *pdev) static int clps711x_fb_remove(struct platform_device *pdev)
{ {
unregister_framebuffer(cfb); unregister_framebuffer(cfb);
kfree(cfb); kfree(cfb);
@ -305,7 +305,7 @@ static struct platform_driver clps711x_fb_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = clps711x_fb_probe, .probe = clps711x_fb_probe,
.remove = __devexit_p(clps711x_fb_remove), .remove = clps711x_fb_remove,
}; };
module_platform_driver(clps711x_fb_driver); module_platform_driver(clps711x_fb_driver);

8
drivers/video/cobalt_lcdfb.c
View File

@ -167,7 +167,7 @@ static void lcd_clear(struct fb_info *info)
lcd_write_control(info, LCD_RESET); lcd_write_control(info, LCD_RESET);
} }
static struct fb_fix_screeninfo cobalt_lcdfb_fix __devinitdata = { static struct fb_fix_screeninfo cobalt_lcdfb_fix = {
.id = "cobalt-lcd", .id = "cobalt-lcd",
.type = FB_TYPE_TEXT, .type = FB_TYPE_TEXT,
.type_aux = FB_AUX_TEXT_MDA, .type_aux = FB_AUX_TEXT_MDA,
@ -331,7 +331,7 @@ static struct fb_ops cobalt_lcd_fbops = {
.fb_cursor = cobalt_lcdfb_cursor, .fb_cursor = cobalt_lcdfb_cursor,
}; };
static int __devinit cobalt_lcdfb_probe(struct platform_device *dev) static int cobalt_lcdfb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
struct resource *res; struct resource *res;
@ -374,7 +374,7 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit cobalt_lcdfb_remove(struct platform_device *dev) static int cobalt_lcdfb_remove(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
@ -389,7 +389,7 @@ static int __devexit cobalt_lcdfb_remove(struct platform_device *dev)
static struct platform_driver cobalt_lcdfb_driver = { static struct platform_driver cobalt_lcdfb_driver = {
.probe = cobalt_lcdfb_probe, .probe = cobalt_lcdfb_probe,
.remove = __devexit_p(cobalt_lcdfb_remove), .remove = cobalt_lcdfb_remove,
.driver = { .driver = {
.name = "cobalt-lcd", .name = "cobalt-lcd",
.owner = THIS_MODULE, .owner = THIS_MODULE,

73
drivers/video/console/sticore.c
View File

@ -238,8 +238,7 @@ static void sti_flush(unsigned long start, unsigned long end)
flush_icache_range(start, end); flush_icache_range(start, end);
} }
static void __devinit sti_rom_copy(unsigned long base, unsigned long count, static void sti_rom_copy(unsigned long base, unsigned long count, void *dest)
void *dest)
{ {
unsigned long dest_start = (unsigned long) dest; unsigned long dest_start = (unsigned long) dest;
@ -266,7 +265,7 @@ static void __devinit sti_rom_copy(unsigned long base, unsigned long count,
static char default_sti_path[21] __read_mostly; static char default_sti_path[21] __read_mostly;
#ifndef MODULE #ifndef MODULE
static int __devinit sti_setup(char *str) static int sti_setup(char *str)
{ {
if (str) if (str)
strlcpy (default_sti_path, str, sizeof (default_sti_path)); strlcpy (default_sti_path, str, sizeof (default_sti_path));
@ -285,12 +284,12 @@ __setup("sti=", sti_setup);
static char __devinitdata *font_name[MAX_STI_ROMS] = { "VGA8x16", }; static char *font_name[MAX_STI_ROMS] = { "VGA8x16", };
static int __devinitdata font_index[MAX_STI_ROMS], static int font_index[MAX_STI_ROMS],
font_height[MAX_STI_ROMS], font_height[MAX_STI_ROMS],
font_width[MAX_STI_ROMS]; font_width[MAX_STI_ROMS];
#ifndef MODULE #ifndef MODULE
static int __devinit sti_font_setup(char *str) static int sti_font_setup(char *str)
{ {
char *x; char *x;
int i = 0; int i = 0;
@ -343,8 +342,8 @@ __setup("sti_font=", sti_font_setup);
static void __devinit static void sti_dump_globcfg(struct sti_glob_cfg *glob_cfg,
sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request) unsigned int sti_mem_request)
{ {
struct sti_glob_cfg_ext *cfg; struct sti_glob_cfg_ext *cfg;
@ -383,8 +382,7 @@ sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
cfg->sti_mem_addr, sti_mem_request)); cfg->sti_mem_addr, sti_mem_request));
} }
static void __devinit static void sti_dump_outptr(struct sti_struct *sti)
sti_dump_outptr(struct sti_struct *sti)
{ {
DPRINTK((KERN_INFO DPRINTK((KERN_INFO
"%d bits per pixel\n" "%d bits per pixel\n"
@ -397,9 +395,8 @@ sti_dump_outptr(struct sti_struct *sti)
sti->outptr.attributes)); sti->outptr.attributes));
} }
static int __devinit static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address,
sti_init_glob_cfg(struct sti_struct *sti, unsigned long hpa)
unsigned long rom_address, unsigned long hpa)
{ {
struct sti_glob_cfg *glob_cfg; struct sti_glob_cfg *glob_cfg;
struct sti_glob_cfg_ext *glob_cfg_ext; struct sti_glob_cfg_ext *glob_cfg_ext;
@ -479,8 +476,8 @@ sti_init_glob_cfg(struct sti_struct *sti,
} }
#ifdef CONFIG_FB #ifdef CONFIG_FB
static struct sti_cooked_font __devinit static struct sti_cooked_font *
*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
{ {
const struct font_desc *fbfont; const struct font_desc *fbfont;
unsigned int size, bpc; unsigned int size, bpc;
@ -535,15 +532,14 @@ static struct sti_cooked_font __devinit
return cooked_font; return cooked_font;
} }
#else #else
static struct sti_cooked_font __devinit static struct sti_cooked_font *
*sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
{ {
return NULL; return NULL;
} }
#endif #endif
static struct sti_cooked_font __devinit static struct sti_cooked_font *sti_select_font(struct sti_cooked_rom *rom,
*sti_select_font(struct sti_cooked_rom *rom,
int (*search_font_fnc)(struct sti_cooked_rom *, int, int)) int (*search_font_fnc)(struct sti_cooked_rom *, int, int))
{ {
struct sti_cooked_font *font; struct sti_cooked_font *font;
@ -569,8 +565,7 @@ static struct sti_cooked_font __devinit
} }
static void __devinit static void sti_dump_rom(struct sti_rom *rom)
sti_dump_rom(struct sti_rom *rom)
{ {
printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n", printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n",
rom->graphics_id[0], rom->graphics_id[0],
@ -587,8 +582,7 @@ sti_dump_rom(struct sti_rom *rom)
} }
static int __devinit static int sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
struct sti_rom *raw_rom) struct sti_rom *raw_rom)
{ {
struct sti_rom_font *raw_font, *font_start; struct sti_rom_font *raw_font, *font_start;
@ -622,8 +616,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
} }
static int __devinit static int sti_search_font(struct sti_cooked_rom *rom, int height, int width)
sti_search_font(struct sti_cooked_rom *rom, int height, int width)
{ {
struct sti_cooked_font *font; struct sti_cooked_font *font;
int i = 0; int i = 0;
@ -639,8 +632,7 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width)
#define BMODE_RELOCATE(offset) offset = (offset) / 4; #define BMODE_RELOCATE(offset) offset = (offset) / 4;
#define BMODE_LAST_ADDR_OFFS 0x50 #define BMODE_LAST_ADDR_OFFS 0x50
static void * __devinit static void *sti_bmode_font_raw(struct sti_cooked_font *f)
sti_bmode_font_raw(struct sti_cooked_font *f)
{ {
unsigned char *n, *p, *q; unsigned char *n, *p, *q;
int size = f->raw->bytes_per_char*256+sizeof(struct sti_rom_font); 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)
return n + 3; return n + 3;
} }
static void __devinit static void sti_bmode_rom_copy(unsigned long base, unsigned long count,
sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) void *dest)
{ {
unsigned long dest_start = (unsigned long) dest; unsigned long dest_start = (unsigned long) dest;
@ -672,8 +664,7 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
sti_flush(dest_start, (unsigned long)dest); sti_flush(dest_start, (unsigned long)dest);
} }
static struct sti_rom * __devinit static struct sti_rom *sti_get_bmode_rom (unsigned long address)
sti_get_bmode_rom (unsigned long address)
{ {
struct sti_rom *raw; struct sti_rom *raw;
u32 size; u32 size;
@ -708,7 +699,7 @@ sti_get_bmode_rom (unsigned long address)
return raw; return raw;
} }
static struct sti_rom __devinit *sti_get_wmode_rom(unsigned long address) static struct sti_rom *sti_get_wmode_rom(unsigned long address)
{ {
struct sti_rom *raw; struct sti_rom *raw;
unsigned long size; unsigned long size;
@ -723,7 +714,7 @@ static struct sti_rom __devinit *sti_get_wmode_rom(unsigned long address)
return raw; return raw;
} }
static int __devinit sti_read_rom(int wordmode, struct sti_struct *sti, static int sti_read_rom(int wordmode, struct sti_struct *sti,
unsigned long address) unsigned long address)
{ {
struct sti_cooked_rom *cooked; struct sti_cooked_rom *cooked;
@ -806,8 +797,9 @@ out_err:
return 0; return 0;
} }
static struct sti_struct * __devinit static struct sti_struct *sti_try_rom_generic(unsigned long address,
sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd) unsigned long hpa,
struct pci_dev *pd)
{ {
struct sti_struct *sti; struct sti_struct *sti;
int ok; int ok;
@ -921,7 +913,7 @@ out_err:
return NULL; return NULL;
} }
static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char *path) static void sticore_check_for_default_sti(struct sti_struct *sti, char *path)
{ {
if (strcmp (path, default_sti_path) == 0) if (strcmp (path, default_sti_path) == 0)
default_sti = sti; default_sti = sti;
@ -932,7 +924,7 @@ static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char
* in the additional address field addr[1] while on * in the additional address field addr[1] while on
* older Systems the PDC stores it in page0->proc_sti * older Systems the PDC stores it in page0->proc_sti
*/ */
static int __devinit sticore_pa_init(struct parisc_device *dev) static int sticore_pa_init(struct parisc_device *dev)
{ {
char pa_path[21]; char pa_path[21];
struct sti_struct *sti = NULL; struct sti_struct *sti = NULL;
@ -953,8 +945,7 @@ static int __devinit sticore_pa_init(struct parisc_device *dev)
} }
static int __devinit sticore_pci_init(struct pci_dev *pd, static int sticore_pci_init(struct pci_dev *pd, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
unsigned long fb_base, rom_base; unsigned long fb_base, rom_base;
@ -1001,7 +992,7 @@ static int __devinit sticore_pci_init(struct pci_dev *pd,
} }
static void __devexit sticore_pci_remove(struct pci_dev *pd) static void sticore_pci_remove(struct pci_dev *pd)
{ {
BUG(); BUG();
} }
@ -1043,7 +1034,7 @@ static struct parisc_driver pa_sti_driver = {
static int sticore_initialized __read_mostly; static int sticore_initialized __read_mostly;
static void __devinit sti_init_roms(void) static void sti_init_roms(void)
{ {
if (sticore_initialized) if (sticore_initialized)
return; return;

23
drivers/video/cyber2000fb.c
View File

@ -1230,7 +1230,7 @@ static int cyber2000fb_ddc_getsda(void *data)
return retval; return retval;
} }
static int __devinit cyber2000fb_setup_ddc_bus(struct cfb_info *cfb) static int cyber2000fb_setup_ddc_bus(struct cfb_info *cfb)
{ {
strlcpy(cfb->ddc_adapter.name, cfb->fb.fix.id, strlcpy(cfb->ddc_adapter.name, cfb->fb.fix.id,
sizeof(cfb->ddc_adapter.name)); sizeof(cfb->ddc_adapter.name));
@ -1305,7 +1305,7 @@ static int cyber2000fb_i2c_getscl(void *data)
return ret; return ret;
} }
static int __devinit cyber2000fb_i2c_register(struct cfb_info *cfb) static int cyber2000fb_i2c_register(struct cfb_info *cfb)
{ {
strlcpy(cfb->i2c_adapter.name, cfb->fb.fix.id, strlcpy(cfb->i2c_adapter.name, cfb->fb.fix.id,
sizeof(cfb->i2c_adapter.name)); sizeof(cfb->i2c_adapter.name));
@ -1336,7 +1336,7 @@ static void cyber2000fb_i2c_unregister(struct cfb_info *cfb)
* These parameters give * These parameters give
* 640x480, hsync 31.5kHz, vsync 60Hz * 640x480, hsync 31.5kHz, vsync 60Hz
*/ */
static struct fb_videomode __devinitdata cyber2000fb_default_mode = { static struct fb_videomode cyber2000fb_default_mode = {
.refresh = 60, .refresh = 60,
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -1404,8 +1404,7 @@ static void cyberpro_init_hw(struct cfb_info *cfb)
} }
} }
static struct cfb_info __devinit *cyberpro_alloc_fb_info(unsigned int id, static struct cfb_info *cyberpro_alloc_fb_info(unsigned int id, char *name)
char *name)
{ {
struct cfb_info *cfb; struct cfb_info *cfb;
@ -1524,7 +1523,7 @@ static int cyber2000fb_setup(char *options)
* - memory mapped access to the registers * - memory mapped access to the registers
* - initialised mem_ctl1 and mem_ctl2 appropriately. * - initialised mem_ctl1 and mem_ctl2 appropriately.
*/ */
static int __devinit cyberpro_common_probe(struct cfb_info *cfb) static int cyberpro_common_probe(struct cfb_info *cfb)
{ {
u_long smem_size; u_long smem_size;
u_int h_sync, v_sync; u_int h_sync, v_sync;
@ -1615,7 +1614,7 @@ failed:
return err; return err;
} }
static void __devexit cyberpro_common_remove(struct cfb_info *cfb) static void cyberpro_common_remove(struct cfb_info *cfb)
{ {
unregister_framebuffer(&cfb->fb); unregister_framebuffer(&cfb->fb);
#ifdef CONFIG_FB_CYBER2000_DDC #ifdef CONFIG_FB_CYBER2000_DDC
@ -1646,7 +1645,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
#include <mach/framebuffer.h> #include <mach/framebuffer.h>
static int __devinit cyberpro_vl_probe(void) static int cyberpro_vl_probe(void)
{ {
struct cfb_info *cfb; struct cfb_info *cfb;
int err = -ENOMEM; int err = -ENOMEM;
@ -1780,8 +1779,8 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb)
return 0; return 0;
} }
static int __devinit static int cyberpro_pci_probe(struct pci_dev *dev,
cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct cfb_info *cfb; struct cfb_info *cfb;
char name[16]; char name[16];
@ -1863,7 +1862,7 @@ failed_release:
return err; return err;
} }
static void __devexit cyberpro_pci_remove(struct pci_dev *dev) static void cyberpro_pci_remove(struct pci_dev *dev)
{ {
struct cfb_info *cfb = pci_get_drvdata(dev); struct cfb_info *cfb = pci_get_drvdata(dev);
@ -1923,7 +1922,7 @@ MODULE_DEVICE_TABLE(pci, cyberpro_pci_table);
static struct pci_driver cyberpro_driver = { static struct pci_driver cyberpro_driver = {
.name = "CyberPro", .name = "CyberPro",
.probe = cyberpro_pci_probe, .probe = cyberpro_pci_probe,
.remove = __devexit_p(cyberpro_pci_remove), .remove = cyberpro_pci_remove,
.suspend = cyberpro_pci_suspend, .suspend = cyberpro_pci_suspend,
.resume = cyberpro_pci_resume, .resume = cyberpro_pci_resume,
.id_table = cyberpro_pci_table .id_table = cyberpro_pci_table

10
drivers/video/da8xx-fb.c
View File

@ -185,7 +185,7 @@ struct da8xx_fb_par {
}; };
/* Variable Screen Information */ /* Variable Screen Information */
static struct fb_var_screeninfo da8xx_fb_var __devinitdata = { static struct fb_var_screeninfo da8xx_fb_var = {
.xoffset = 0, .xoffset = 0,
.yoffset = 0, .yoffset = 0,
.transp = {0, 0, 0}, .transp = {0, 0, 0},
@ -202,7 +202,7 @@ static struct fb_var_screeninfo da8xx_fb_var __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED .vmode = FB_VMODE_NONINTERLACED
}; };
static struct fb_fix_screeninfo da8xx_fb_fix __devinitdata = { static struct fb_fix_screeninfo da8xx_fb_fix = {
.id = "DA8xx FB Drv", .id = "DA8xx FB Drv",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.type_aux = 0, .type_aux = 0,
@ -993,7 +993,7 @@ static inline void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
} }
#endif #endif
static int __devexit fb_remove(struct platform_device *dev) static int fb_remove(struct platform_device *dev)
{ {
struct fb_info *info = dev_get_drvdata(&dev->dev); struct fb_info *info = dev_get_drvdata(&dev->dev);
@ -1211,7 +1211,7 @@ static unsigned int da8xxfb_pixel_clk_period(struct da8xx_fb_par *par)
return pix_clk_period_picosec; return pix_clk_period_picosec;
} }
static int __devinit fb_probe(struct platform_device *device) static int fb_probe(struct platform_device *device)
{ {
struct da8xx_lcdc_platform_data *fb_pdata = struct da8xx_lcdc_platform_data *fb_pdata =
device->dev.platform_data; device->dev.platform_data;
@ -1580,7 +1580,7 @@ static int fb_resume(struct platform_device *dev)
static struct platform_driver da8xx_fb_driver = { static struct platform_driver da8xx_fb_driver = {
.probe = fb_probe, .probe = fb_probe,
.remove = __devexit_p(fb_remove), .remove = fb_remove,
.suspend = fb_suspend, .suspend = fb_suspend,
.resume = fb_resume, .resume = fb_resume,
.driver = { .driver = {

6
drivers/video/dnfb.c
View File

@ -115,7 +115,7 @@ static struct fb_ops dn_fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
struct fb_var_screeninfo dnfb_var __devinitdata = { struct fb_var_screeninfo dnfb_var = {
.xres = 1280, .xres = 1280,
.yres = 1024, .yres = 1024,
.xres_virtual = 2048, .xres_virtual = 2048,
@ -126,7 +126,7 @@ struct fb_var_screeninfo dnfb_var __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo dnfb_fix __devinitdata = { static struct fb_fix_screeninfo dnfb_fix = {
.id = "Apollo Mono", .id = "Apollo Mono",
.smem_start = (FRAME_BUFFER_START + IO_BASE), .smem_start = (FRAME_BUFFER_START + IO_BASE),
.smem_len = FRAME_BUFFER_LEN, .smem_len = FRAME_BUFFER_LEN,
@ -224,7 +224,7 @@ void dnfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
* Initialization * Initialization
*/ */
static int __devinit dnfb_probe(struct platform_device *dev) static int dnfb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
int err = 0; int err = 0;

4
drivers/video/efifb.c
View File

@ -20,7 +20,7 @@ static bool request_mem_succeeded = false;
static struct pci_dev *default_vga; static struct pci_dev *default_vga;
static struct fb_var_screeninfo efifb_defined __devinitdata = { static struct fb_var_screeninfo efifb_defined = {
.activate = FB_ACTIVATE_NOW, .activate = FB_ACTIVATE_NOW,
.height = -1, .height = -1,
.width = -1, .width = -1,
@ -31,7 +31,7 @@ static struct fb_var_screeninfo efifb_defined __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo efifb_fix __devinitdata = { static struct fb_fix_screeninfo efifb_fix = {
.id = "EFI VGA", .id = "EFI VGA",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,

8
drivers/video/ep93xx-fb.c
View File

@ -484,7 +484,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
info->screen_base, info->fix.smem_start); info->screen_base, info->fix.smem_start);
} }
static int __devinit ep93xxfb_probe(struct platform_device *pdev) static int ep93xxfb_probe(struct platform_device *pdev)
{ {
struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data; struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
struct fb_info *info; struct fb_info *info;
@ -599,7 +599,7 @@ failed_cmap:
return err; return err;
} }
static int __devexit ep93xxfb_remove(struct platform_device *pdev) static int ep93xxfb_remove(struct platform_device *pdev)
{ {
struct fb_info *info = platform_get_drvdata(pdev); struct fb_info *info = platform_get_drvdata(pdev);
struct ep93xx_fbi *fbi = info->par; struct ep93xx_fbi *fbi = info->par;
@ -620,14 +620,14 @@ static int __devexit ep93xxfb_remove(struct platform_device *pdev)
static struct platform_driver ep93xxfb_driver = { static struct platform_driver ep93xxfb_driver = {
.probe = ep93xxfb_probe, .probe = ep93xxfb_probe,
.remove = __devexit_p(ep93xxfb_remove), .remove = ep93xxfb_remove,
.driver = { .driver = {
.name = "ep93xx-fb", .name = "ep93xx-fb",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
static int __devinit ep93xxfb_init(void) static int ep93xxfb_init(void)
{ {
return platform_driver_register(&ep93xxfb_driver); return platform_driver_register(&ep93xxfb_driver);
} }

6
drivers/video/exynos/exynos_dp_core.c
View File

@ -1033,7 +1033,7 @@ static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
static int __devinit exynos_dp_probe(struct platform_device *pdev) static int exynos_dp_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct exynos_dp_device *dp; struct exynos_dp_device *dp;
@ -1114,7 +1114,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit exynos_dp_remove(struct platform_device *pdev) static int exynos_dp_remove(struct platform_device *pdev)
{ {
struct exynos_dp_platdata *pdata = pdev->dev.platform_data; struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
struct exynos_dp_device *dp = platform_get_drvdata(pdev); struct exynos_dp_device *dp = platform_get_drvdata(pdev);
@ -1195,7 +1195,7 @@ MODULE_DEVICE_TABLE(of, exynos_dp_match);
static struct platform_driver exynos_dp_driver = { static struct platform_driver exynos_dp_driver = {
.probe = exynos_dp_probe, .probe = exynos_dp_probe,
.remove = __devexit_p(exynos_dp_remove), .remove = exynos_dp_remove,
.driver = { .driver = {
.name = "exynos-dp", .name = "exynos-dp",
.owner = THIS_MODULE, .owner = THIS_MODULE,

4
drivers/video/exynos/exynos_mipi_dsi.c
View File

@ -490,7 +490,7 @@ err_platform_get_irq:
return ret; return ret;
} }
static int __devexit exynos_mipi_dsi_remove(struct platform_device *pdev) static int exynos_mipi_dsi_remove(struct platform_device *pdev)
{ {
struct mipi_dsim_device *dsim = platform_get_drvdata(pdev); struct mipi_dsim_device *dsim = platform_get_drvdata(pdev);
struct mipi_dsim_ddi *dsim_ddi, *next; struct mipi_dsim_ddi *dsim_ddi, *next;
@ -595,7 +595,7 @@ static const struct dev_pm_ops exynos_mipi_dsi_pm_ops = {
static struct platform_driver exynos_mipi_dsi_driver = { static struct platform_driver exynos_mipi_dsi_driver = {
.probe = exynos_mipi_dsi_probe, .probe = exynos_mipi_dsi_probe,
.remove = __devexit_p(exynos_mipi_dsi_remove), .remove = exynos_mipi_dsi_remove,
.driver = { .driver = {
.name = "exynos-mipi-dsim", .name = "exynos-mipi-dsim",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/video/ffb.c
View File

@ -893,7 +893,7 @@ static void ffb_init_fix(struct fb_info *info)
info->fix.accel = FB_ACCEL_SUN_CREATOR; info->fix.accel = FB_ACCEL_SUN_CREATOR;
} }
static int __devinit ffb_probe(struct platform_device *op) static int ffb_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct ffb_fbc __iomem *fbc; struct ffb_fbc __iomem *fbc;
@ -1022,7 +1022,7 @@ out_err:
return err; return err;
} }
static int __devexit ffb_remove(struct platform_device *op) static int ffb_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct ffb_par *par = info->par; struct ffb_par *par = info->par;
@ -1058,7 +1058,7 @@ static struct platform_driver ffb_driver = {
.of_match_table = ffb_match, .of_match_table = ffb_match,
}, },
.probe = ffb_probe, .probe = ffb_probe,
.remove = __devexit_p(ffb_remove), .remove = ffb_remove,
}; };
static int __init ffb_init(void) static int __init ffb_init(void)

14
drivers/video/fm2fb.c
View File

@ -127,7 +127,7 @@
static volatile unsigned char *fm2fb_reg; static volatile unsigned char *fm2fb_reg;
static struct fb_fix_screeninfo fb_fix __devinitdata = { static struct fb_fix_screeninfo fb_fix = {
.smem_len = FRAMEMASTER_REG, .smem_len = FRAMEMASTER_REG,
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
@ -136,12 +136,12 @@ static struct fb_fix_screeninfo fb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static int fm2fb_mode __devinitdata = -1; static int fm2fb_mode = -1;
#define FM2FB_MODE_PAL 0 #define FM2FB_MODE_PAL 0
#define FM2FB_MODE_NTSC 1 #define FM2FB_MODE_NTSC 1
static struct fb_var_screeninfo fb_var_modes[] __devinitdata = { static struct fb_var_screeninfo fb_var_modes[] = {
{ {
/* 768 x 576, 32 bpp (PAL) */ /* 768 x 576, 32 bpp (PAL) */
768, 576, 768, 576, 0, 0, 32, 0, 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,
* Initialisation * Initialisation
*/ */
static int __devinit fm2fb_probe(struct zorro_dev *z, static int fm2fb_probe(struct zorro_dev *z, const struct zorro_device_id *id);
const struct zorro_device_id *id);
static struct zorro_device_id fm2fb_devices[] __devinitdata = { static struct zorro_device_id fm2fb_devices[] = {
{ ZORRO_PROD_BSC_FRAMEMASTER_II }, { ZORRO_PROD_BSC_FRAMEMASTER_II },
{ ZORRO_PROD_HELFRICH_RAINBOW_II }, { ZORRO_PROD_HELFRICH_RAINBOW_II },
{ 0 } { 0 }
@ -227,8 +226,7 @@ static struct zorro_driver fm2fb_driver = {
.probe = fm2fb_probe, .probe = fm2fb_probe,
}; };
static int __devinit fm2fb_probe(struct zorro_dev *z, static int fm2fb_probe(struct zorro_dev *z, const struct zorro_device_id *id)
const struct zorro_device_id *id)
{ {
struct fb_info *info; struct fb_info *info;
unsigned long *ptr; unsigned long *ptr;

6
drivers/video/fsl-diu-fb.c
View File

@ -55,7 +55,7 @@
* order if increasing resolution and frequency. The 320x240-60 mode is * order if increasing resolution and frequency. The 320x240-60 mode is
* the initial AOI for the second and third planes. * the initial AOI for the second and third planes.
*/ */
static struct fb_videomode __devinitdata fsl_diu_mode_db[] = { static struct fb_videomode fsl_diu_mode_db[] = {
{ {
.refresh = 60, .refresh = 60,
.xres = 1024, .xres = 1024,
@ -1307,7 +1307,7 @@ static struct fb_ops fsl_diu_ops = {
.fb_release = fsl_diu_release, .fb_release = fsl_diu_release,
}; };
static int __devinit install_fb(struct fb_info *info) static int install_fb(struct fb_info *info)
{ {
int rc; int rc;
struct mfb_info *mfbi = info->par; struct mfb_info *mfbi = info->par;
@ -1518,7 +1518,7 @@ static ssize_t show_monitor(struct device *device,
return 0; return 0;
} }
static int __devinit fsl_diu_probe(struct platform_device *pdev) static int fsl_diu_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct mfb_info *mfbi; struct mfb_info *mfbi;

24
drivers/video/gbefb.c
View File

@ -91,10 +91,10 @@ static uint32_t pseudo_palette[16];
static uint32_t gbe_cmap[256]; static uint32_t gbe_cmap[256];
static int gbe_turned_on; /* 0 turned off, 1 turned on */ static int gbe_turned_on; /* 0 turned off, 1 turned on */
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
/* default CRT mode */ /* default CRT mode */
static struct fb_var_screeninfo default_var_CRT __devinitdata = { static struct fb_var_screeninfo default_var_CRT = {
/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */ /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -125,7 +125,7 @@ static struct fb_var_screeninfo default_var_CRT __devinitdata = {
}; };
/* default LCD mode */ /* default LCD mode */
static struct fb_var_screeninfo default_var_LCD __devinitdata = { static struct fb_var_screeninfo default_var_LCD = {
/* 1600x1024, 8 bpp */ /* 1600x1024, 8 bpp */
.xres = 1600, .xres = 1600,
.yres = 1024, .yres = 1024,
@ -157,7 +157,7 @@ static struct fb_var_screeninfo default_var_LCD __devinitdata = {
/* default modedb mode */ /* default modedb mode */
/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */ /* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
static struct fb_videomode default_mode_CRT __devinitdata = { static struct fb_videomode default_mode_CRT = {
.refresh = 60, .refresh = 60,
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -172,7 +172,7 @@ static struct fb_videomode default_mode_CRT __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
/* 1600x1024 SGI flatpanel 1600sw */ /* 1600x1024 SGI flatpanel 1600sw */
static struct fb_videomode default_mode_LCD __devinitdata = { static struct fb_videomode default_mode_LCD = {
/* 1600x1024, 8 bpp */ /* 1600x1024, 8 bpp */
.xres = 1600, .xres = 1600,
.yres = 1024, .yres = 1024,
@ -186,8 +186,8 @@ static struct fb_videomode default_mode_LCD __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_videomode *default_mode __devinitdata = &default_mode_CRT; static struct fb_videomode *default_mode = &default_mode_CRT;
static struct fb_var_screeninfo *default_var __devinitdata = &default_var_CRT; static struct fb_var_screeninfo *default_var = &default_var_CRT;
static int flat_panel_enabled = 0; static int flat_panel_enabled = 0;
@ -1082,7 +1082,7 @@ static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *at
static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL); static DEVICE_ATTR(revision, S_IRUGO, gbefb_show_rev, NULL);
static void __devexit gbefb_remove_sysfs(struct device *dev) static void gbefb_remove_sysfs(struct device *dev)
{ {
device_remove_file(dev, &dev_attr_size); device_remove_file(dev, &dev_attr_size);
device_remove_file(dev, &dev_attr_revision); device_remove_file(dev, &dev_attr_revision);
@ -1098,7 +1098,7 @@ static void gbefb_create_sysfs(struct device *dev)
* Initialization * Initialization
*/ */
static int __devinit gbefb_setup(char *options) static int gbefb_setup(char *options)
{ {
char *this_opt; char *this_opt;
@ -1129,7 +1129,7 @@ static int __devinit gbefb_setup(char *options)
return 0; return 0;
} }
static int __devinit gbefb_probe(struct platform_device *p_dev) static int gbefb_probe(struct platform_device *p_dev)
{ {
int i, ret = 0; int i, ret = 0;
struct fb_info *info; struct fb_info *info;
@ -1254,7 +1254,7 @@ out_release_framebuffer:
return ret; return ret;
} }
static int __devexit gbefb_remove(struct platform_device* p_dev) static int gbefb_remove(struct platform_device* p_dev)
{ {
struct fb_info *info = platform_get_drvdata(p_dev); struct fb_info *info = platform_get_drvdata(p_dev);
@ -1273,7 +1273,7 @@ static int __devexit gbefb_remove(struct platform_device* p_dev)
static struct platform_driver gbefb_driver = { static struct platform_driver gbefb_driver = {
.probe = gbefb_probe, .probe = gbefb_probe,
.remove = __devexit_p(gbefb_remove), .remove = gbefb_remove,
.driver = { .driver = {
.name = "gbefb", .name = "gbefb",
}, },

14
drivers/video/geode/gx1fb_core.c
View File

@ -29,7 +29,7 @@ static int crt_option = 1;
static char panel_option[32] = ""; static char panel_option[32] = "";
/* Modes relevant to the GX1 (taken from modedb.c) */ /* Modes relevant to the GX1 (taken from modedb.c) */
static const struct fb_videomode __devinitconst gx1_modedb[] = { static const struct fb_videomode gx1_modedb[] = {
/* 640x480-60 VESA */ /* 640x480-60 VESA */
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info)
return par->vid_ops->blank_display(info, blank_mode); return par->vid_ops->blank_display(info, blank_mode);
} }
static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev) static int gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
{ {
struct geodefb_par *par = info->par; struct geodefb_par *par = info->par;
unsigned gx_base; unsigned gx_base;
@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev) static struct fb_info *gx1fb_init_fbinfo(struct device *dev)
{ {
struct geodefb_par *par; struct geodefb_par *par;
struct fb_info *info; struct fb_info *info;
@ -318,7 +318,7 @@ static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)
return info; return info;
} }
static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) static int gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
struct geodefb_par *par; struct geodefb_par *par;
struct fb_info *info; struct fb_info *info;
@ -382,7 +382,7 @@ static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_i
return ret; return ret;
} }
static void __devexit gx1fb_remove(struct pci_dev *pdev) static void gx1fb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct geodefb_par *par = info->par; struct geodefb_par *par = info->par;
@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = {
.name = "gx1fb", .name = "gx1fb",
.id_table = gx1fb_id_table, .id_table = gx1fb_id_table,
.probe = gx1fb_probe, .probe = gx1fb_probe,
.remove = __devexit_p(gx1fb_remove), .remove = gx1fb_remove,
}; };
static int __init gx1fb_init(void) static int __init gx1fb_init(void)
@ -456,7 +456,7 @@ static int __init gx1fb_init(void)
return pci_register_driver(&gx1fb_driver); return pci_register_driver(&gx1fb_driver);
} }
static void __devexit gx1fb_cleanup(void) static void gx1fb_cleanup(void)
{ {
pci_unregister_driver(&gx1fb_driver); pci_unregister_driver(&gx1fb_driver);
} }

20
drivers/video/geode/gxfb_core.c
View File

@ -40,7 +40,7 @@ static int vram;
static int vt_switch; static int vt_switch;
/* Modes relevant to the GX (taken from modedb.c) */ /* Modes relevant to the GX (taken from modedb.c) */
static struct fb_videomode gx_modedb[] __devinitdata = { static struct fb_videomode gx_modedb[] = {
/* 640x480-60 VESA */ /* 640x480-60 VESA */
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@ -110,15 +110,14 @@ static struct fb_videomode gx_modedb[] __devinitdata = {
#ifdef CONFIG_OLPC #ifdef CONFIG_OLPC
#include <asm/olpc.h> #include <asm/olpc.h>
static struct fb_videomode gx_dcon_modedb[] __devinitdata = { static struct fb_videomode gx_dcon_modedb[] = {
/* The only mode the DCON has is 1200x900 */ /* The only mode the DCON has is 1200x900 */
{ NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED, 0 } FB_VMODE_NONINTERLACED, 0 }
}; };
static void __devinit get_modedb(struct fb_videomode **modedb, static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
unsigned int *size)
{ {
if (olpc_has_dcon()) { if (olpc_has_dcon()) {
*modedb = (struct fb_videomode *) gx_dcon_modedb; *modedb = (struct fb_videomode *) gx_dcon_modedb;
@ -130,8 +129,7 @@ static void __devinit get_modedb(struct fb_videomode **modedb,
} }
#else #else
static void __devinit get_modedb(struct fb_videomode **modedb, static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
unsigned int *size)
{ {
*modedb = (struct fb_videomode *) gx_modedb; *modedb = (struct fb_videomode *) gx_modedb;
*size = ARRAY_SIZE(gx_modedb); *size = ARRAY_SIZE(gx_modedb);
@ -228,8 +226,7 @@ static int gxfb_blank(int blank_mode, struct fb_info *info)
return gx_blank_display(info, blank_mode); return gx_blank_display(info, blank_mode);
} }
static int __devinit gxfb_map_video_memory(struct fb_info *info, static int gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
struct pci_dev *dev)
{ {
struct gxfb_par *par = info->par; struct gxfb_par *par = info->par;
int ret; int ret;
@ -293,7 +290,7 @@ static struct fb_ops gxfb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static struct fb_info *__devinit gxfb_init_fbinfo(struct device *dev) static struct fb_info *gxfb_init_fbinfo(struct device *dev)
{ {
struct gxfb_par *par; struct gxfb_par *par;
struct fb_info *info; struct fb_info *info;
@ -374,8 +371,7 @@ static int gxfb_resume(struct pci_dev *pdev)
} }
#endif #endif
static int __devinit gxfb_probe(struct pci_dev *pdev, static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct gxfb_par *par; struct gxfb_par *par;
struct fb_info *info; struct fb_info *info;
@ -455,7 +451,7 @@ static int __devinit gxfb_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit gxfb_remove(struct pci_dev *pdev) static void gxfb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct gxfb_par *par = info->par; struct gxfb_par *par = info->par;

20
drivers/video/geode/lxfb_core.c
View File

@ -35,7 +35,7 @@ static int vt_switch;
* we try to make it something sane - 640x480-60 is sane * we try to make it something sane - 640x480-60 is sane
*/ */
static struct fb_videomode geode_modedb[] __devinitdata = { static struct fb_videomode geode_modedb[] = {
/* 640x480-60 */ /* 640x480-60 */
{ NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2, { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
@ -219,15 +219,14 @@ static struct fb_videomode geode_modedb[] __devinitdata = {
#ifdef CONFIG_OLPC #ifdef CONFIG_OLPC
#include <asm/olpc.h> #include <asm/olpc.h>
static struct fb_videomode olpc_dcon_modedb[] __devinitdata = { static struct fb_videomode olpc_dcon_modedb[] = {
/* The only mode the DCON has is 1200x900 */ /* The only mode the DCON has is 1200x900 */
{ NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED, 0 } FB_VMODE_NONINTERLACED, 0 }
}; };
static void __devinit get_modedb(struct fb_videomode **modedb, static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
unsigned int *size)
{ {
if (olpc_has_dcon()) { if (olpc_has_dcon()) {
*modedb = (struct fb_videomode *) olpc_dcon_modedb; *modedb = (struct fb_videomode *) olpc_dcon_modedb;
@ -239,8 +238,7 @@ static void __devinit get_modedb(struct fb_videomode **modedb,
} }
#else #else
static void __devinit get_modedb(struct fb_videomode **modedb, static void get_modedb(struct fb_videomode **modedb, unsigned int *size)
unsigned int *size)
{ {
*modedb = (struct fb_videomode *) geode_modedb; *modedb = (struct fb_videomode *) geode_modedb;
*size = ARRAY_SIZE(geode_modedb); *size = ARRAY_SIZE(geode_modedb);
@ -336,8 +334,7 @@ static int lxfb_blank(int blank_mode, struct fb_info *info)
} }
static int __devinit lxfb_map_video_memory(struct fb_info *info, static int lxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
struct pci_dev *dev)
{ {
struct lxfb_par *par = info->par; struct lxfb_par *par = info->par;
int ret; int ret;
@ -414,7 +411,7 @@ static struct fb_ops lxfb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static struct fb_info * __devinit lxfb_init_fbinfo(struct device *dev) static struct fb_info *lxfb_init_fbinfo(struct device *dev)
{ {
struct lxfb_par *par; struct lxfb_par *par;
struct fb_info *info; struct fb_info *info;
@ -498,8 +495,7 @@ static int lxfb_resume(struct pci_dev *pdev)
#define lxfb_resume NULL #define lxfb_resume NULL
#endif #endif
static int __devinit lxfb_probe(struct pci_dev *pdev, static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct lxfb_par *par; struct lxfb_par *par;
struct fb_info *info; struct fb_info *info;
@ -590,7 +586,7 @@ err:
return ret; return ret;
} }
static void __devexit lxfb_remove(struct pci_dev *pdev) static void lxfb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct lxfb_par *par = info->par; struct lxfb_par *par = info->par;

10
drivers/video/grvga.c
View File

@ -70,7 +70,7 @@ static const struct fb_videomode grvga_modedb[] = {
} }
}; };
static struct fb_fix_screeninfo grvga_fix __devinitdata = { static struct fb_fix_screeninfo grvga_fix = {
.id = "AG SVGACTRL", .id = "AG SVGACTRL",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -267,7 +267,7 @@ static struct fb_ops grvga_ops = {
.fb_imageblit = cfb_imageblit .fb_imageblit = cfb_imageblit
}; };
static int __devinit grvga_parse_custom(char *options, static int grvga_parse_custom(char *options,
struct fb_var_screeninfo *screendata) struct fb_var_screeninfo *screendata)
{ {
char *this_opt; char *this_opt;
@ -329,7 +329,7 @@ static int __devinit grvga_parse_custom(char *options,
return 0; return 0;
} }
static int __devinit grvga_probe(struct platform_device *dev) static int grvga_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
int retval = -ENOMEM; int retval = -ENOMEM;
@ -512,7 +512,7 @@ free_fb:
return retval; return retval;
} }
static int __devexit grvga_remove(struct platform_device *device) static int grvga_remove(struct platform_device *device)
{ {
struct fb_info *info = dev_get_drvdata(&device->dev); struct fb_info *info = dev_get_drvdata(&device->dev);
struct grvga_par *par = info->par; struct grvga_par *par = info->par;
@ -554,7 +554,7 @@ static struct platform_driver grvga_driver = {
.of_match_table = svgactrl_of_match, .of_match_table = svgactrl_of_match,
}, },
.probe = grvga_probe, .probe = grvga_probe,
.remove = __devexit_p(grvga_remove), .remove = grvga_remove,
}; };

13
drivers/video/gxt4500.c
View File

@ -159,7 +159,7 @@ struct gxt4500_par {
static char *mode_option; static char *mode_option;
/* default mode: 1280x1024 @ 60 Hz, 8 bpp */ /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
static const struct fb_videomode defaultmode __devinitconst = { static const struct fb_videomode defaultmode = {
.refresh = 60, .refresh = 60,
.xres = 1280, .xres = 1280,
.yres = 1024, .yres = 1024,
@ -588,7 +588,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
return 0; return 0;
} }
static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = { static const struct fb_fix_screeninfo gxt4500_fix = {
.id = "IBM GXT4500P", .id = "IBM GXT4500P",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -610,8 +610,7 @@ static struct fb_ops gxt4500_ops = {
}; };
/* PCI functions */ /* PCI functions */
static int __devinit gxt4500_probe(struct pci_dev *pdev, static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
int err; int err;
unsigned long reg_phys, fb_phys; unsigned long reg_phys, fb_phys;
@ -720,7 +719,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
static void __devexit gxt4500_remove(struct pci_dev *pdev) static void gxt4500_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct gxt4500_par *par; struct gxt4500_par *par;
@ -758,10 +757,10 @@ static struct pci_driver gxt4500_driver = {
.name = "gxt4500", .name = "gxt4500",
.id_table = gxt4500_pci_tbl, .id_table = gxt4500_pci_tbl,
.probe = gxt4500_probe, .probe = gxt4500_probe,
.remove = __devexit_p(gxt4500_remove), .remove = gxt4500_remove,
}; };
static int __devinit gxt4500_init(void) static int gxt4500_init(void)
{ {
#ifndef MODULE #ifndef MODULE
if (fb_get_options("gxt4500", &mode_option)) if (fb_get_options("gxt4500", &mode_option))

10
drivers/video/hecubafb.c
View File

@ -47,7 +47,7 @@
#define DPY_W 600 #define DPY_W 600
#define DPY_H 800 #define DPY_H 800
static struct fb_fix_screeninfo hecubafb_fix __devinitdata = { static struct fb_fix_screeninfo hecubafb_fix = {
.id = "hecubafb", .id = "hecubafb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_MONO01, .visual = FB_VISUAL_MONO01,
@ -58,7 +58,7 @@ static struct fb_fix_screeninfo hecubafb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo hecubafb_var __devinitdata = { static struct fb_var_screeninfo hecubafb_var = {
.xres = DPY_W, .xres = DPY_W,
.yres = DPY_H, .yres = DPY_H,
.xres_virtual = DPY_W, .xres_virtual = DPY_W,
@ -211,7 +211,7 @@ static struct fb_deferred_io hecubafb_defio = {
.deferred_io = hecubafb_dpy_deferred_io, .deferred_io = hecubafb_dpy_deferred_io,
}; };
static int __devinit hecubafb_probe(struct platform_device *dev) static int hecubafb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
struct hecuba_board *board; struct hecuba_board *board;
@ -280,7 +280,7 @@ err_videomem_alloc:
return retval; return retval;
} }
static int __devexit hecubafb_remove(struct platform_device *dev) static int hecubafb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
@ -299,7 +299,7 @@ static int __devexit hecubafb_remove(struct platform_device *dev)
static struct platform_driver hecubafb_driver = { static struct platform_driver hecubafb_driver = {
.probe = hecubafb_probe, .probe = hecubafb_probe,
.remove = __devexit_p(hecubafb_remove), .remove = hecubafb_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "hecubafb", .name = "hecubafb",

12
drivers/video/hgafb.c
View File

@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(hga_reg_lock);
/* Framebuffer driver structures */ /* Framebuffer driver structures */
static struct fb_var_screeninfo hga_default_var __devinitdata = { static struct fb_var_screeninfo hga_default_var = {
.xres = 720, .xres = 720,
.yres = 348, .yres = 348,
.xres_virtual = 720, .xres_virtual = 720,
@ -120,7 +120,7 @@ static struct fb_var_screeninfo hga_default_var __devinitdata = {
.width = -1, .width = -1,
}; };
static struct fb_fix_screeninfo hga_fix __devinitdata = { static struct fb_fix_screeninfo hga_fix = {
.id = "HGA", .id = "HGA",
.type = FB_TYPE_PACKED_PIXELS, /* (not sure) */ .type = FB_TYPE_PACKED_PIXELS, /* (not sure) */
.visual = FB_VISUAL_MONO10, .visual = FB_VISUAL_MONO10,
@ -276,7 +276,7 @@ static void hga_blank(int blank_mode)
spin_unlock_irqrestore(&hga_reg_lock, flags); spin_unlock_irqrestore(&hga_reg_lock, flags);
} }
static int __devinit hga_card_detect(void) static int hga_card_detect(void)
{ {
int count = 0; int count = 0;
void __iomem *p, *q; void __iomem *p, *q;
@ -546,7 +546,7 @@ static struct fb_ops hgafb_ops = {
* Initialization * Initialization
*/ */
static int __devinit hgafb_probe(struct platform_device *pdev) static int hgafb_probe(struct platform_device *pdev)
{ {
struct fb_info *info; struct fb_info *info;
@ -592,7 +592,7 @@ static int __devinit hgafb_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit hgafb_remove(struct platform_device *pdev) static int hgafb_remove(struct platform_device *pdev)
{ {
struct fb_info *info = platform_get_drvdata(pdev); struct fb_info *info = platform_get_drvdata(pdev);
@ -617,7 +617,7 @@ static int __devexit hgafb_remove(struct platform_device *pdev)
static struct platform_driver hgafb_driver = { static struct platform_driver hgafb_driver = {
.probe = hgafb_probe, .probe = hgafb_probe,
.remove = __devexit_p(hgafb_remove), .remove = hgafb_remove,
.driver = { .driver = {
.name = "hgafb", .name = "hgafb",
}, },

10
drivers/video/hitfb.c
View File

@ -30,14 +30,14 @@
#define WIDTH 640 #define WIDTH 640
static struct fb_var_screeninfo hitfb_var __devinitdata = { static struct fb_var_screeninfo hitfb_var = {
.activate = FB_ACTIVATE_NOW, .activate = FB_ACTIVATE_NOW,
.height = -1, .height = -1,
.width = -1, .width = -1,
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo hitfb_fix __devinitdata = { static struct fb_fix_screeninfo hitfb_fix = {
.id = "Hitachi HD64461", .id = "Hitachi HD64461",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
@ -324,7 +324,7 @@ static struct fb_ops hitfb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int __devinit hitfb_probe(struct platform_device *dev) static int hitfb_probe(struct platform_device *dev)
{ {
unsigned short lcdclor, ldr3, ldvndr; unsigned short lcdclor, ldr3, ldvndr;
struct fb_info *info; struct fb_info *info;
@ -417,7 +417,7 @@ err_fb:
return ret; return ret;
} }
static int __devexit hitfb_remove(struct platform_device *dev) static int hitfb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
@ -462,7 +462,7 @@ static const struct dev_pm_ops hitfb_dev_pm_ops = {
static struct platform_driver hitfb_driver = { static struct platform_driver hitfb_driver = {
.probe = hitfb_probe, .probe = hitfb_probe,
.remove = __devexit_p(hitfb_remove), .remove = hitfb_remove,
.driver = { .driver = {
.name = "hitfb", .name = "hitfb",
.owner = THIS_MODULE, .owner = THIS_MODULE,

9
drivers/video/hpfb.c
View File

@ -206,8 +206,7 @@ static struct fb_ops hpfb_ops = {
#define HPFB_FBOMSB 0x5d /* Frame buffer offset */ #define HPFB_FBOMSB 0x5d /* Frame buffer offset */
#define HPFB_FBOLSB 0x5f #define HPFB_FBOLSB 0x5f
static int __devinit hpfb_init_one(unsigned long phys_base, static int hpfb_init_one(unsigned long phys_base, unsigned long virt_base)
unsigned long virt_base)
{ {
unsigned long fboff, fb_width, fb_height, fb_start; unsigned long fboff, fb_width, fb_height, fb_start;
int ret; int ret;
@ -327,7 +326,7 @@ unmap_screen_base:
/* /*
* Initialise the framebuffer * Initialise the framebuffer
*/ */
static int __devinit hpfb_dio_probe(struct dio_dev * d, const struct dio_device_id * ent) static int hpfb_dio_probe(struct dio_dev *d, const struct dio_device_id *ent)
{ {
unsigned long paddr, vaddr; unsigned long paddr, vaddr;
@ -350,7 +349,7 @@ static int __devinit hpfb_dio_probe(struct dio_dev * d, const struct dio_device_
return 0; return 0;
} }
static void __devexit hpfb_remove_one(struct dio_dev *d) static void hpfb_remove_one(struct dio_dev *d)
{ {
unregister_framebuffer(&fb_info); unregister_framebuffer(&fb_info);
if (d->scode >= DIOII_SCBASE) if (d->scode >= DIOII_SCBASE)
@ -373,7 +372,7 @@ static struct dio_driver hpfb_driver = {
.name = "hpfb", .name = "hpfb",
.id_table = hpfb_dio_tbl, .id_table = hpfb_dio_tbl,
.probe = hpfb_dio_probe, .probe = hpfb_dio_probe,
.remove = __devexit_p(hpfb_remove_one), .remove = hpfb_remove_one,
}; };
int __init hpfb_init(void) int __init hpfb_init(void)

15
drivers/video/i740fb.c
View File

@ -33,10 +33,10 @@
#include "i740_reg.h" #include "i740_reg.h"
static char *mode_option __devinitdata; static char *mode_option;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static int mtrr __devinitdata = 1; static int mtrr = 1;
#endif #endif
struct i740fb_par { struct i740fb_par {
@ -91,7 +91,7 @@ struct i740fb_par {
#define DACSPEED24_SD 128 #define DACSPEED24_SD 128
#define DACSPEED32 86 #define DACSPEED32 86
static struct fb_fix_screeninfo i740fb_fix __devinitdata = { static struct fb_fix_screeninfo i740fb_fix = {
.id = "i740fb", .id = "i740fb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
@ -163,7 +163,7 @@ static int i740fb_ddc_getsda(void *data)
return !!(i740inreg(par, XRX, REG_DDC_STATE) & DDC_SDA); return !!(i740inreg(par, XRX, REG_DDC_STATE) & DDC_SDA);
} }
static int __devinit i740fb_setup_ddc_bus(struct fb_info *info) static int i740fb_setup_ddc_bus(struct fb_info *info)
{ {
struct i740fb_par *par = info->par; struct i740fb_par *par = info->par;
@ -1007,8 +1007,7 @@ static struct fb_ops i740fb_ops = {
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static int __devinit i740fb_probe(struct pci_dev *dev, static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
struct i740fb_par *par; struct i740fb_par *par;
@ -1174,7 +1173,7 @@ err_enable_device:
return ret; return ret;
} }
static void __devexit i740fb_remove(struct pci_dev *dev) static void i740fb_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
@ -1275,7 +1274,7 @@ static struct pci_driver i740fb_driver = {
.name = "i740fb", .name = "i740fb",
.id_table = i740fb_id_table, .id_table = i740fb_id_table,
.probe = i740fb_probe, .probe = i740fb_probe,
.remove = __devexit_p(i740fb_remove), .remove = i740fb_remove,
.suspend = i740fb_suspend, .suspend = i740fb_suspend,
.resume = i740fb_resume, .resume = i740fb_resume,
}; };

66
drivers/video/i810/i810_main.c
View File

@ -74,11 +74,11 @@
* *
* Experiment with v_offset to find out which works best for you. * Experiment with v_offset to find out which works best for you.
*/ */
static u32 v_offset_default __devinitdata; /* For 32 MiB Aper size, 8 should be the default */ static u32 v_offset_default; /* For 32 MiB Aper size, 8 should be the default */
static u32 voffset __devinitdata; static u32 voffset;
static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor); static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor);
static int __devinit i810fb_init_pci (struct pci_dev *dev, static int i810fb_init_pci(struct pci_dev *dev,
const struct pci_device_id *entry); const struct pci_device_id *entry);
static void __exit i810fb_remove_pci(struct pci_dev *dev); static void __exit i810fb_remove_pci(struct pci_dev *dev);
static int i810fb_resume(struct pci_dev *dev); static int i810fb_resume(struct pci_dev *dev);
@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par); static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
/* PCI */ /* PCI */
static const char * const i810_pci_list[] __devinitconst = { static const char * const i810_pci_list[] = {
"Intel(R) 810 Framebuffer Device" , "Intel(R) 810 Framebuffer Device" ,
"Intel(R) 810-DC100 Framebuffer Device" , "Intel(R) 810-DC100 Framebuffer Device" ,
"Intel(R) 810E Framebuffer Device" , "Intel(R) 810E Framebuffer Device" ,
@ -132,22 +132,22 @@ static struct pci_driver i810fb_driver = {
.resume = i810fb_resume, .resume = i810fb_resume,
}; };
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
static int vram __devinitdata = 4; static int vram = 4;
static int bpp __devinitdata = 8; static int bpp = 8;
static bool mtrr __devinitdata; static bool mtrr;
static bool accel __devinitdata; static bool accel;
static int hsync1 __devinitdata; static int hsync1;
static int hsync2 __devinitdata; static int hsync2;
static int vsync1 __devinitdata; static int vsync1;
static int vsync2 __devinitdata; static int vsync2;
static int xres __devinitdata; static int xres;
static int yres; static int yres;
static int vyres __devinitdata; static int vyres;
static bool sync __devinitdata; static bool sync;
static bool extvga __devinitdata; static bool extvga;
static bool dcolor __devinitdata; static bool dcolor;
static bool ddc3 __devinitdata; static bool ddc3;
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
@ -1541,7 +1541,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
return 0; return 0;
} }
static struct fb_ops i810fb_ops __devinitdata = { static struct fb_ops i810fb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_open = i810fb_open, .fb_open = i810fb_open,
.fb_release = i810fb_release, .fb_release = i810fb_release,
@ -1628,7 +1628,7 @@ fail:
* AGP resource allocation * * AGP resource allocation *
***********************************************************************/ ***********************************************************************/
static void __devinit i810_fix_pointers(struct i810fb_par *par) static void i810_fix_pointers(struct i810fb_par *par)
{ {
par->fb.physical = par->aperture.physical+(par->fb.offset << 12); par->fb.physical = par->aperture.physical+(par->fb.offset << 12);
par->fb.virtual = par->aperture.virtual+(par->fb.offset << 12); par->fb.virtual = par->aperture.virtual+(par->fb.offset << 12);
@ -1640,7 +1640,7 @@ static void __devinit i810_fix_pointers(struct i810fb_par *par)
(par->cursor_heap.offset << 12); (par->cursor_heap.offset << 12);
} }
static void __devinit i810_fix_offsets(struct i810fb_par *par) static void i810_fix_offsets(struct i810fb_par *par)
{ {
if (vram + 1 > par->aperture.size >> 20) if (vram + 1 > par->aperture.size >> 20)
vram = (par->aperture.size >> 20) - 1; vram = (par->aperture.size >> 20) - 1;
@ -1660,7 +1660,7 @@ static void __devinit i810_fix_offsets(struct i810fb_par *par)
par->cursor_heap.size = 4096; par->cursor_heap.size = 4096;
} }
static int __devinit i810_alloc_agp_mem(struct fb_info *info) static int i810_alloc_agp_mem(struct fb_info *info)
{ {
struct i810fb_par *par = info->par; struct i810fb_par *par = info->par;
int size; int size;
@ -1723,7 +1723,7 @@ static int __devinit i810_alloc_agp_mem(struct fb_info *info)
* Sets the user monitor's horizontal and vertical * Sets the user monitor's horizontal and vertical
* frequency limits * frequency limits
*/ */
static void __devinit i810_init_monspecs(struct fb_info *info) static void i810_init_monspecs(struct fb_info *info)
{ {
if (!hsync1) if (!hsync1)
hsync1 = HFMIN; hsync1 = HFMIN;
@ -1755,8 +1755,7 @@ static void __devinit i810_init_monspecs(struct fb_info *info)
* @par: pointer to i810fb_par structure * @par: pointer to i810fb_par structure
* @info: pointer to current fb_info structure * @info: pointer to current fb_info structure
*/ */
static void __devinit i810_init_defaults(struct i810fb_par *par, static void i810_init_defaults(struct i810fb_par *par, struct fb_info *info)
struct fb_info *info)
{ {
mutex_init(&par->open_lock); mutex_init(&par->open_lock);
@ -1812,7 +1811,7 @@ static void __devinit i810_init_defaults(struct i810fb_par *par,
* i810_init_device - initialize device * i810_init_device - initialize device
* @par: pointer to i810fb_par structure * @par: pointer to i810fb_par structure
*/ */
static void __devinit i810_init_device(struct i810fb_par *par) static void i810_init_device(struct i810fb_par *par)
{ {
u8 reg; u8 reg;
u8 __iomem *mmio = par->mmio_start_virtual; u8 __iomem *mmio = par->mmio_start_virtual;
@ -1833,8 +1832,7 @@ static void __devinit i810_init_device(struct i810fb_par *par)
} }
static int __devinit static int i810_allocate_pci_resource(struct i810fb_par *par,
i810_allocate_pci_resource(struct i810fb_par *par,
const struct pci_device_id *entry) const struct pci_device_id *entry)
{ {
int err; int err;
@ -1892,7 +1890,7 @@ i810_allocate_pci_resource(struct i810fb_par *par,
return 0; return 0;
} }
static void __devinit i810fb_find_init_mode(struct fb_info *info) static void i810fb_find_init_mode(struct fb_info *info)
{ {
struct fb_videomode mode; struct fb_videomode mode;
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
@ -1956,7 +1954,7 @@ static void __devinit i810fb_find_init_mode(struct fb_info *info)
} }
#ifndef MODULE #ifndef MODULE
static int __devinit i810fb_setup(char *options) static int i810fb_setup(char *options)
{ {
char *this_opt, *suffix = NULL; char *this_opt, *suffix = NULL;
@ -2007,7 +2005,7 @@ static int __devinit i810fb_setup(char *options)
} }
#endif #endif
static int __devinit i810fb_init_pci (struct pci_dev *dev, static int i810fb_init_pci(struct pci_dev *dev,
const struct pci_device_id *entry) const struct pci_device_id *entry)
{ {
struct fb_info *info; struct fb_info *info;
@ -2136,7 +2134,7 @@ static void __exit i810fb_remove_pci(struct pci_dev *dev)
} }
#ifndef MODULE #ifndef MODULE
static int __devinit i810fb_init(void) static int i810fb_init(void)
{ {
char *option = NULL; char *option = NULL;
@ -2154,7 +2152,7 @@ static int __devinit i810fb_init(void)
#ifdef MODULE #ifdef MODULE
static int __devinit i810fb_init(void) static int i810fb_init(void)
{ {
hsync1 *= 1000; hsync1 *= 1000;
hsync2 *= 1000; hsync2 *= 1000;

2
drivers/video/i810/i810_main.h
View File

@ -64,7 +64,7 @@ static inline void flush_cache(void)
#include <asm/mtrr.h> #include <asm/mtrr.h>
static inline void __devinit set_mtrr(struct i810fb_par *par) static inline void set_mtrr(struct i810fb_par *par)
{ {
par->mtrr_reg = mtrr_add((u32) par->aperture.physical, par->mtrr_reg = mtrr_add((u32) par->aperture.physical,
par->aperture.size, MTRR_TYPE_WRCOMB, 1); par->aperture.size, MTRR_TYPE_WRCOMB, 1);

2
drivers/video/igafb.c
View File

@ -571,7 +571,7 @@ static int __init igafb_setup(char *options)
module_init(igafb_init); module_init(igafb_init);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static struct pci_device_id igafb_pci_tbl[] __devinitdata = { static struct pci_device_id igafb_pci_tbl[] = {
{ PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682, { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ } { }

17
drivers/video/imsttfb.c
View File

@ -225,7 +225,7 @@ struct initvalues {
__u8 addr, value; __u8 addr, value;
}; };
static struct initvalues ibm_initregs[] __devinitdata = { static struct initvalues ibm_initregs[] = {
{ CLKCTL, 0x21 }, { CLKCTL, 0x21 },
{ SYNCCTL, 0x00 }, { SYNCCTL, 0x00 },
{ HSYNCPOS, 0x00 }, { HSYNCPOS, 0x00 },
@ -272,7 +272,7 @@ static struct initvalues ibm_initregs[] __devinitdata = {
{ KEYCTL, 0x00 } { KEYCTL, 0x00 }
}; };
static struct initvalues tvp_initregs[] __devinitdata = { static struct initvalues tvp_initregs[] = {
{ TVPIRICC, 0x00 }, { TVPIRICC, 0x00 },
{ TVPIRBRC, 0xe4 }, { TVPIRBRC, 0xe4 },
{ TVPIRLAC, 0x06 }, { TVPIRLAC, 0x06 },
@ -336,7 +336,7 @@ enum {
static int inverse = 0; static int inverse = 0;
static char fontname[40] __initdata = { 0 }; static char fontname[40] __initdata = { 0 };
#if defined(CONFIG_PPC) #if defined(CONFIG_PPC)
static signed char init_vmode __devinitdata = -1, init_cmode __devinitdata = -1; static signed char init_vmode = -1, init_cmode = -1;
#endif #endif
static struct imstt_regvals tvp_reg_init_2 = { static struct imstt_regvals tvp_reg_init_2 = {
@ -1333,7 +1333,7 @@ static struct pci_driver imsttfb_pci_driver = {
.name = "imsttfb", .name = "imsttfb",
.id_table = imsttfb_pci_tbl, .id_table = imsttfb_pci_tbl,
.probe = imsttfb_probe, .probe = imsttfb_probe,
.remove = __devexit_p(imsttfb_remove), .remove = imsttfb_remove,
}; };
static struct fb_ops imsttfb_ops = { static struct fb_ops imsttfb_ops = {
@ -1349,8 +1349,7 @@ static struct fb_ops imsttfb_ops = {
.fb_ioctl = imsttfb_ioctl, .fb_ioctl = imsttfb_ioctl,
}; };
static void __devinit static void init_imstt(struct fb_info *info)
init_imstt(struct fb_info *info)
{ {
struct imstt_par *par = info->par; struct imstt_par *par = info->par;
__u32 i, tmp, *ip, *end; __u32 i, tmp, *ip, *end;
@ -1466,8 +1465,7 @@ init_imstt(struct fb_info *info)
info->node, info->fix.id, info->fix.smem_len >> 20, tmp); info->node, info->fix.id, info->fix.smem_len >> 20, tmp);
} }
static int __devinit static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
unsigned long addr, size; unsigned long addr, size;
struct imstt_par *par; struct imstt_par *par;
@ -1534,8 +1532,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0; return 0;
} }
static void __devexit static void imsttfb_remove(struct pci_dev *pdev)
imsttfb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct imstt_par *par = info->par; struct imstt_par *par = info->par;

4
drivers/video/imxfb.c
View File

@ -917,7 +917,7 @@ failed_init:
return ret; return ret;
} }
static int __devexit imxfb_remove(struct platform_device *pdev) static int imxfb_remove(struct platform_device *pdev)
{ {
struct imx_fb_platform_data *pdata; struct imx_fb_platform_data *pdata;
struct fb_info *info = platform_get_drvdata(pdev); struct fb_info *info = platform_get_drvdata(pdev);
@ -959,7 +959,7 @@ void imxfb_shutdown(struct platform_device * dev)
static struct platform_driver imxfb_driver = { static struct platform_driver imxfb_driver = {
.suspend = imxfb_suspend, .suspend = imxfb_suspend,
.resume = imxfb_resume, .resume = imxfb_resume,
.remove = __devexit_p(imxfb_remove), .remove = imxfb_remove,
.shutdown = imxfb_shutdown, .shutdown = imxfb_shutdown,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,

25
drivers/video/intelfb/intelfbdrv.c
View File

@ -132,7 +132,7 @@
#include "intelfbhw.h" #include "intelfbhw.h"
#include "../edid.h" #include "../edid.h"
static void __devinit get_initial_mode(struct intelfb_info *dinfo); static void get_initial_mode(struct intelfb_info *dinfo);
static void update_dinfo(struct intelfb_info *dinfo, static void update_dinfo(struct intelfb_info *dinfo,
struct fb_var_screeninfo *var); struct fb_var_screeninfo *var);
static int intelfb_open(struct fb_info *info, int user); static int intelfb_open(struct fb_info *info, int user);
@ -162,10 +162,10 @@ static int intelfb_sync(struct fb_info *info);
static int intelfb_ioctl(struct fb_info *info, static int intelfb_ioctl(struct fb_info *info,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
static int __devinit intelfb_pci_register(struct pci_dev *pdev, static int intelfb_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent); const struct pci_device_id *ent);
static void __devexit intelfb_pci_unregister(struct pci_dev *pdev); static void intelfb_pci_unregister(struct pci_dev *pdev);
static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo); static int intelfb_set_fbinfo(struct intelfb_info *dinfo);
/* /*
* Limiting the class to PCI_CLASS_DISPLAY_VGA prevents function 1 of the * 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);
#define INTELFB_CLASS_MASK 0 #define INTELFB_CLASS_MASK 0
#endif #endif
static struct pci_device_id intelfb_pci_table[] __devinitdata = { static struct pci_device_id intelfb_pci_table[] = {
{ 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 }, { 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 },
{ 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 }, { 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 },
{ 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 }, { 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 = {
.name = "intelfb", .name = "intelfb",
.id_table = intelfb_pci_table, .id_table = intelfb_pci_table,
.probe = intelfb_pci_register, .probe = intelfb_pci_register,
.remove = __devexit_p(intelfb_pci_unregister) .remove = intelfb_pci_unregister,
}; };
/* Module description/parameters */ /* Module description/parameters */
@ -415,7 +415,7 @@ module_exit(intelfb_exit);
***************************************************************/ ***************************************************************/
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static inline void __devinit set_mtrr(struct intelfb_info *dinfo) static inline void set_mtrr(struct intelfb_info *dinfo)
{ {
dinfo->mtrr_reg = mtrr_add(dinfo->aperture.physical, dinfo->mtrr_reg = mtrr_add(dinfo->aperture.physical,
dinfo->aperture.size, MTRR_TYPE_WRCOMB, 1); dinfo->aperture.size, MTRR_TYPE_WRCOMB, 1);
@ -497,7 +497,7 @@ static void cleanup(struct intelfb_info *dinfo)
} while (0) } while (0)
static int __devinit intelfb_pci_register(struct pci_dev *pdev, static int intelfb_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
@ -921,8 +921,7 @@ err_out_cmap:
return -ENODEV; return -ENODEV;
} }
static void __devexit static void intelfb_pci_unregister(struct pci_dev *pdev)
intelfb_pci_unregister(struct pci_dev *pdev)
{ {
struct intelfb_info *dinfo = pci_get_drvdata(pdev); struct intelfb_info *dinfo = pci_get_drvdata(pdev);
@ -970,7 +969,7 @@ static __inline__ int var_to_refresh(const struct fb_var_screeninfo *var)
* Various intialisation functions * * Various intialisation functions *
***************************************************************/ ***************************************************************/
static void __devinit get_initial_mode(struct intelfb_info *dinfo) static void get_initial_mode(struct intelfb_info *dinfo)
{ {
struct fb_var_screeninfo *var; struct fb_var_screeninfo *var;
int xtot, ytot; int xtot, ytot;
@ -1037,7 +1036,7 @@ static void __devinit get_initial_mode(struct intelfb_info *dinfo)
} }
} }
static int __devinit intelfb_init_var(struct intelfb_info *dinfo) static int intelfb_init_var(struct intelfb_info *dinfo)
{ {
struct fb_var_screeninfo *var; struct fb_var_screeninfo *var;
int msrc = 0; int msrc = 0;
@ -1118,7 +1117,7 @@ static int __devinit intelfb_init_var(struct intelfb_info *dinfo)
return 0; return 0;
} }
static int __devinit intelfb_set_fbinfo(struct intelfb_info *dinfo) static int intelfb_set_fbinfo(struct intelfb_info *dinfo)
{ {
struct fb_info *info = dinfo->info; struct fb_info *info = dinfo->info;

8
drivers/video/jz4740_fb.c
View File

@ -136,7 +136,7 @@ struct jzfb {
uint32_t pseudo_palette[16]; uint32_t pseudo_palette[16];
}; };
static const struct fb_fix_screeninfo jzfb_fix __devinitconst = { static const struct fb_fix_screeninfo jzfb_fix = {
.id = "JZ4740 FB", .id = "JZ4740 FB",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
@ -619,7 +619,7 @@ static struct fb_ops jzfb_ops = {
.fb_setcolreg = jzfb_setcolreg, .fb_setcolreg = jzfb_setcolreg,
}; };
static int __devinit jzfb_probe(struct platform_device *pdev) static int jzfb_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct jzfb *jzfb; struct jzfb *jzfb;
@ -725,7 +725,7 @@ err_framebuffer_release:
return ret; return ret;
} }
static int __devexit jzfb_remove(struct platform_device *pdev) static int jzfb_remove(struct platform_device *pdev)
{ {
struct jzfb *jzfb = platform_get_drvdata(pdev); struct jzfb *jzfb = platform_get_drvdata(pdev);
@ -794,7 +794,7 @@ static const struct dev_pm_ops jzfb_pm_ops = {
static struct platform_driver jzfb_driver = { static struct platform_driver jzfb_driver = {
.probe = jzfb_probe, .probe = jzfb_probe,
.remove = __devexit_p(jzfb_remove), .remove = jzfb_remove,
.driver = { .driver = {
.name = "jz4740-fb", .name = "jz4740-fb",
.pm = JZFB_PM_OPS, .pm = JZFB_PM_OPS,

21
drivers/video/kyro/fbdev.c
View File

@ -40,14 +40,14 @@
#define KHZ2PICOS(a) (1000000000UL/(a)) #define KHZ2PICOS(a) (1000000000UL/(a))
/****************************************************************************/ /****************************************************************************/
static struct fb_fix_screeninfo kyro_fix __devinitdata = { static struct fb_fix_screeninfo kyro_fix = {
.id = "ST Kyro", .id = "ST Kyro",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo kyro_var __devinitdata = { static struct fb_var_screeninfo kyro_var = {
/* 640x480, 16bpp @ 60 Hz */ /* 640x480, 16bpp @ 60 Hz */
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -81,18 +81,18 @@ typedef struct {
/* global graphics card info structure (one per card) */ /* global graphics card info structure (one per card) */
static device_info_t deviceInfo; static device_info_t deviceInfo;
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
static int nopan __devinitdata = 0; static int nopan = 0;
static int nowrap __devinitdata = 1; static int nowrap = 1;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static int nomtrr __devinitdata = 0; static int nomtrr = 0;
#endif #endif
/* PCI driver prototypes */ /* PCI driver prototypes */
static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
static void kyrofb_remove(struct pci_dev *pdev); static void kyrofb_remove(struct pci_dev *pdev);
static struct fb_videomode kyro_modedb[] __devinitdata = { static struct fb_videomode kyro_modedb[] = {
{ {
/* 640x350 @ 85Hz */ /* 640x350 @ 85Hz */
NULL, 85, 640, 350, KHZ2PICOS(31500), NULL, 85, 640, 350, KHZ2PICOS(31500),
@ -653,7 +653,7 @@ static struct pci_driver kyrofb_pci_driver = {
.name = "kyrofb", .name = "kyrofb",
.id_table = kyrofb_pci_tbl, .id_table = kyrofb_pci_tbl,
.probe = kyrofb_probe, .probe = kyrofb_probe,
.remove = __devexit_p(kyrofb_remove), .remove = kyrofb_remove,
}; };
static struct fb_ops kyrofb_ops = { static struct fb_ops kyrofb_ops = {
@ -667,8 +667,7 @@ static struct fb_ops kyrofb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int __devinit kyrofb_probe(struct pci_dev *pdev, static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
struct kyrofb_info *currentpar; struct kyrofb_info *currentpar;
@ -754,7 +753,7 @@ out_unmap:
return -EINVAL; return -EINVAL;
} }
static void __devexit kyrofb_remove(struct pci_dev *pdev) static void kyrofb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct kyrofb_info *par = info->par; struct kyrofb_info *par = info->par;

6
drivers/video/leo.c
View File

@ -547,7 +547,7 @@ static void leo_unmap_regs(struct platform_device *op, struct fb_info *info,
of_iounmap(&op->resource[0], info->screen_base, 0x800000); of_iounmap(&op->resource[0], info->screen_base, 0x800000);
} }
static int __devinit leo_probe(struct platform_device *op) static int leo_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -636,7 +636,7 @@ out_err:
return err; return err;
} }
static int __devexit leo_remove(struct platform_device *op) static int leo_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct leo_par *par = info->par; struct leo_par *par = info->par;
@ -668,7 +668,7 @@ static struct platform_driver leo_driver = {
.of_match_table = leo_match, .of_match_table = leo_match,
}, },
.probe = leo_probe, .probe = leo_probe,
.remove = __devexit_p(leo_remove), .remove = leo_remove,
}; };
static int __init leo_init(void) static int __init leo_init(void)

18
drivers/video/mb862xx/mb862xxfbdrv.c
View File

@ -668,7 +668,7 @@ static int mb862xx_gdc_init(struct mb862xxfb_par *par)
return 0; return 0;
} }
static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev) static int of_platform_mb862xx_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct device *dev = &ofdev->dev; struct device *dev = &ofdev->dev;
@ -786,7 +786,7 @@ fbrel:
return ret; return ret;
} }
static int __devexit of_platform_mb862xx_remove(struct platform_device *ofdev) static int of_platform_mb862xx_remove(struct platform_device *ofdev)
{ {
struct fb_info *fbi = dev_get_drvdata(&ofdev->dev); struct fb_info *fbi = dev_get_drvdata(&ofdev->dev);
struct mb862xxfb_par *par = fbi->par; struct mb862xxfb_par *par = fbi->par;
@ -823,7 +823,7 @@ static int __devexit of_platform_mb862xx_remove(struct platform_device *ofdev)
/* /*
* common types * common types
*/ */
static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = { static struct of_device_id of_platform_mb862xx_tbl[] = {
{ .compatible = "fujitsu,MB86276", }, { .compatible = "fujitsu,MB86276", },
{ .compatible = "fujitsu,lime", }, { .compatible = "fujitsu,lime", },
{ .compatible = "fujitsu,MB86277", }, { .compatible = "fujitsu,MB86277", },
@ -841,7 +841,7 @@ static struct platform_driver of_platform_mb862xxfb_driver = {
.of_match_table = of_platform_mb862xx_tbl, .of_match_table = of_platform_mb862xx_tbl,
}, },
.probe = of_platform_mb862xx_probe, .probe = of_platform_mb862xx_probe,
.remove = __devexit_p(of_platform_mb862xx_remove), .remove = of_platform_mb862xx_remove,
}; };
#endif #endif
@ -984,7 +984,7 @@ static inline int mb862xx_pci_gdc_init(struct mb862xxfb_par *par)
#define CHIP_ID(id) \ #define CHIP_ID(id) \
{ PCI_DEVICE(PCI_VENDOR_ID_FUJITSU_LIMITED, id) } { PCI_DEVICE(PCI_VENDOR_ID_FUJITSU_LIMITED, id) }
static struct pci_device_id mb862xx_pci_tbl[] __devinitdata = { static struct pci_device_id mb862xx_pci_tbl[] = {
/* MB86295/MB86296 */ /* MB86295/MB86296 */
CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALP), CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALP),
CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALPA), CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALPA),
@ -995,7 +995,7 @@ static struct pci_device_id mb862xx_pci_tbl[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, mb862xx_pci_tbl); MODULE_DEVICE_TABLE(pci, mb862xx_pci_tbl);
static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, static int mb862xx_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct mb862xxfb_par *par; struct mb862xxfb_par *par;
@ -1133,7 +1133,7 @@ out:
return ret; return ret;
} }
static void __devexit mb862xx_pci_remove(struct pci_dev *pdev) static void mb862xx_pci_remove(struct pci_dev *pdev)
{ {
struct fb_info *fbi = pci_get_drvdata(pdev); struct fb_info *fbi = pci_get_drvdata(pdev);
struct mb862xxfb_par *par = fbi->par; struct mb862xxfb_par *par = fbi->par;
@ -1174,11 +1174,11 @@ static struct pci_driver mb862xxfb_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = mb862xx_pci_tbl, .id_table = mb862xx_pci_tbl,
.probe = mb862xx_pci_probe, .probe = mb862xx_pci_probe,
.remove = __devexit_p(mb862xx_pci_remove), .remove = mb862xx_pci_remove,
}; };
#endif #endif
static int __devinit mb862xxfb_init(void) static int mb862xxfb_init(void)
{ {
int ret = -ENODEV; int ret = -ENODEV;

4
drivers/video/mbx/mbxdebugfs.c
View File

@ -213,7 +213,7 @@ static const struct file_operations misc_fops = {
.llseek = default_llseek, .llseek = default_llseek,
}; };
static void __devinit mbxfb_debugfs_init(struct fb_info *fbi) static void mbxfb_debugfs_init(struct fb_info *fbi)
{ {
struct mbxfb_info *mfbi = fbi->par; struct mbxfb_info *mfbi = fbi->par;
struct mbxfb_debugfs_data *dbg; struct mbxfb_debugfs_data *dbg;
@ -236,7 +236,7 @@ static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)
fbi, &misc_fops); fbi, &misc_fops);
} }
static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi) static void mbxfb_debugfs_remove(struct fb_info *fbi)
{ {
struct mbxfb_info *mfbi = fbi->par; struct mbxfb_info *mfbi = fbi->par;
struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data; struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data;

18
drivers/video/mbx/mbxfb.c
View File

@ -79,7 +79,7 @@ struct mbxfb_info {
}; };
static struct fb_var_screeninfo mbxfb_default __devinitdata = { static struct fb_var_screeninfo mbxfb_default = {
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
.xres_virtual = 640, .xres_virtual = 640,
@ -102,7 +102,7 @@ static struct fb_var_screeninfo mbxfb_default __devinitdata = {
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
}; };
static struct fb_fix_screeninfo mbxfb_fix __devinitdata = { static struct fb_fix_screeninfo mbxfb_fix = {
.id = "MBX", .id = "MBX",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
@ -687,7 +687,7 @@ static struct fb_ops mbxfb_ops = {
Enable external SDRAM controller. Assume that all clocks are active Enable external SDRAM controller. Assume that all clocks are active
by now. by now.
*/ */
static void __devinit setup_memc(struct fb_info *fbi) static void setup_memc(struct fb_info *fbi)
{ {
unsigned long tmp; unsigned long tmp;
int i; int i;
@ -747,7 +747,7 @@ static void enable_clocks(struct fb_info *fbi)
write_reg_dly(0x00000001, PIXCLKDIV); write_reg_dly(0x00000001, PIXCLKDIV);
} }
static void __devinit setup_graphics(struct fb_info *fbi) static void setup_graphics(struct fb_info *fbi)
{ {
unsigned long gsctrl; unsigned long gsctrl;
unsigned long vscadr; unsigned long vscadr;
@ -781,7 +781,7 @@ static void __devinit setup_graphics(struct fb_info *fbi)
write_reg_dly(vscadr, VSCADR); write_reg_dly(vscadr, VSCADR);
} }
static void __devinit setup_display(struct fb_info *fbi) static void setup_display(struct fb_info *fbi)
{ {
unsigned long dsctrl = 0; unsigned long dsctrl = 0;
@ -795,7 +795,7 @@ static void __devinit setup_display(struct fb_info *fbi)
write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL); write_reg_dly((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
} }
static void __devinit enable_controller(struct fb_info *fbi) static void enable_controller(struct fb_info *fbi)
{ {
u32 svctrl, shctrl; u32 svctrl, shctrl;
@ -881,7 +881,7 @@ static int mbxfb_resume(struct platform_device *dev)
#define res_size(_r) (((_r)->end - (_r)->start) + 1) #define res_size(_r) (((_r)->end - (_r)->start) + 1)
static int __devinit mbxfb_probe(struct platform_device *dev) static int mbxfb_probe(struct platform_device *dev)
{ {
int ret; int ret;
struct fb_info *fbi; struct fb_info *fbi;
@ -1006,7 +1006,7 @@ err1:
return ret; return ret;
} }
static int __devexit mbxfb_remove(struct platform_device *dev) static int mbxfb_remove(struct platform_device *dev)
{ {
struct fb_info *fbi = platform_get_drvdata(dev); struct fb_info *fbi = platform_get_drvdata(dev);
@ -1038,7 +1038,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
static struct platform_driver mbxfb_driver = { static struct platform_driver mbxfb_driver = {
.probe = mbxfb_probe, .probe = mbxfb_probe,
.remove = __devexit_p(mbxfb_remove), .remove = mbxfb_remove,
.suspend = mbxfb_suspend, .suspend = mbxfb_suspend,
.resume = mbxfb_resume, .resume = mbxfb_resume,
.driver = { .driver = {

20
drivers/video/metronomefb.c
View File

@ -99,7 +99,7 @@ static struct epd_frame epd_frame_table[] = {
}, },
}; };
static struct fb_fix_screeninfo metronomefb_fix __devinitdata = { static struct fb_fix_screeninfo metronomefb_fix = {
.id = "metronomefb", .id = "metronomefb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_STATIC_PSEUDOCOLOR, .visual = FB_VISUAL_STATIC_PSEUDOCOLOR,
@ -110,7 +110,7 @@ static struct fb_fix_screeninfo metronomefb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo metronomefb_var __devinitdata = { static struct fb_var_screeninfo metronomefb_var = {
.xres = DPY_W, .xres = DPY_W,
.yres = DPY_H, .yres = DPY_H,
.xres_virtual = DPY_W, .xres_virtual = DPY_W,
@ -167,7 +167,7 @@ static u16 calc_img_cksum(u16 *start, int length)
} }
/* here we decode the incoming waveform file and populate metromem */ /* here we decode the incoming waveform file and populate metromem */
static int __devinit load_waveform(u8 *mem, size_t size, int m, int t, static int load_waveform(u8 *mem, size_t size, int m, int t,
struct metronomefb_par *par) struct metronomefb_par *par)
{ {
int tta; int tta;
@ -338,7 +338,7 @@ static int metronome_display_cmd(struct metronomefb_par *par)
return par->board->met_wait_event_intr(par); return par->board->met_wait_event_intr(par);
} }
static int __devinit metronome_powerup_cmd(struct metronomefb_par *par) static int metronome_powerup_cmd(struct metronomefb_par *par)
{ {
int i; int i;
u16 cs; u16 cs;
@ -367,7 +367,7 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
return par->board->met_wait_event(par); return par->board->met_wait_event(par);
} }
static int __devinit metronome_config_cmd(struct metronomefb_par *par) static int metronome_config_cmd(struct metronomefb_par *par)
{ {
/* setup config command /* setup config command
we can't immediately set the opcode since the controller we can't immediately set the opcode since the controller
@ -385,7 +385,7 @@ static int __devinit metronome_config_cmd(struct metronomefb_par *par)
return par->board->met_wait_event(par); return par->board->met_wait_event(par);
} }
static int __devinit metronome_init_cmd(struct metronomefb_par *par) static int metronome_init_cmd(struct metronomefb_par *par)
{ {
int i; int i;
u16 cs; u16 cs;
@ -411,7 +411,7 @@ static int __devinit metronome_init_cmd(struct metronomefb_par *par)
return par->board->met_wait_event(par); return par->board->met_wait_event(par);
} }
static int __devinit metronome_init_regs(struct metronomefb_par *par) static int metronome_init_regs(struct metronomefb_par *par)
{ {
int res; int res;
@ -569,7 +569,7 @@ static struct fb_deferred_io metronomefb_defio = {
.deferred_io = metronomefb_dpy_deferred_io, .deferred_io = metronomefb_dpy_deferred_io,
}; };
static int __devinit metronomefb_probe(struct platform_device *dev) static int metronomefb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
struct metronome_board *board; struct metronome_board *board;
@ -741,7 +741,7 @@ err:
return retval; return retval;
} }
static int __devexit metronomefb_remove(struct platform_device *dev) static int metronomefb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
@ -763,7 +763,7 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
static struct platform_driver metronomefb_driver = { static struct platform_driver metronomefb_driver = {
.probe = metronomefb_probe, .probe = metronomefb_probe,
.remove = __devexit_p(metronomefb_remove), .remove = metronomefb_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "metronomefb", .name = "metronomefb",

7
drivers/video/msm/mddi.c
View File

@ -417,7 +417,7 @@ static void mddi_resume(struct msm_mddi_client_data *cdata)
mddi_set_auto_hibernate(&mddi->client_data, 1); mddi_set_auto_hibernate(&mddi->client_data, 1);
} }
static int __devinit mddi_get_client_caps(struct mddi_info *mddi) static int mddi_get_client_caps(struct mddi_info *mddi)
{ {
int i, j; int i, j;
@ -619,8 +619,7 @@ uint32_t mddi_remote_read(struct msm_mddi_client_data *cdata, uint32_t reg)
static struct mddi_info mddi_info[2]; static struct mddi_info mddi_info[2];
static int __devinit mddi_clk_setup(struct platform_device *pdev, static int mddi_clk_setup(struct platform_device *pdev, struct mddi_info *mddi,
struct mddi_info *mddi,
unsigned long clk_rate) unsigned long clk_rate)
{ {
int ret; int ret;
@ -664,7 +663,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi)
return 0; return 0;
} }
static int __devinit mddi_probe(struct platform_device *pdev) static int mddi_probe(struct platform_device *pdev)
{ {
struct msm_mddi_platform_data *pdata = pdev->dev.platform_data; struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
struct mddi_info *mddi = &mddi_info[pdev->id]; struct mddi_info *mddi = &mddi_info[pdev->id];

12
drivers/video/mxsfb.c
View File

@ -586,7 +586,7 @@ static struct fb_ops mxsfb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int __devinit mxsfb_restore_mode(struct mxsfb_info *host) static int mxsfb_restore_mode(struct mxsfb_info *host)
{ {
struct fb_info *fb_info = &host->fb_info; struct fb_info *fb_info = &host->fb_info;
unsigned line_count; unsigned line_count;
@ -677,7 +677,7 @@ static int __devinit mxsfb_restore_mode(struct mxsfb_info *host)
return 0; return 0;
} }
static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host) static int mxsfb_init_fbinfo(struct mxsfb_info *host)
{ {
struct fb_info *fb_info = &host->fb_info; struct fb_info *fb_info = &host->fb_info;
struct fb_var_screeninfo *var = &fb_info->var; struct fb_var_screeninfo *var = &fb_info->var;
@ -739,7 +739,7 @@ static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host)
return 0; return 0;
} }
static void __devexit mxsfb_free_videomem(struct mxsfb_info *host) static void mxsfb_free_videomem(struct mxsfb_info *host)
{ {
struct fb_info *fb_info = &host->fb_info; struct fb_info *fb_info = &host->fb_info;
@ -772,7 +772,7 @@ static const struct of_device_id mxsfb_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, mxsfb_dt_ids); MODULE_DEVICE_TABLE(of, mxsfb_dt_ids);
static int __devinit mxsfb_probe(struct platform_device *pdev) static int mxsfb_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id = const struct of_device_id *of_id =
of_match_device(mxsfb_dt_ids, &pdev->dev); of_match_device(mxsfb_dt_ids, &pdev->dev);
@ -912,7 +912,7 @@ error_alloc_info:
return ret; return ret;
} }
static int __devexit mxsfb_remove(struct platform_device *pdev) static int mxsfb_remove(struct platform_device *pdev)
{ {
struct fb_info *fb_info = platform_get_drvdata(pdev); struct fb_info *fb_info = platform_get_drvdata(pdev);
struct mxsfb_info *host = to_imxfb_host(fb_info); struct mxsfb_info *host = to_imxfb_host(fb_info);
@ -949,7 +949,7 @@ static void mxsfb_shutdown(struct platform_device *pdev)
static struct platform_driver mxsfb_driver = { static struct platform_driver mxsfb_driver = {
.probe = mxsfb_probe, .probe = mxsfb_probe,
.remove = __devexit_p(mxsfb_remove), .remove = mxsfb_remove,
.shutdown = mxsfb_shutdown, .shutdown = mxsfb_shutdown,
.id_table = mxsfb_devtype, .id_table = mxsfb_devtype,
.driver = { .driver = {

26
drivers/video/neofb.c
View File

@ -88,7 +88,7 @@ static bool external;
static bool libretto; static bool libretto;
static bool nostretch; static bool nostretch;
static bool nopciburst; static bool nopciburst;
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
#ifdef MODULE #ifdef MODULE
@ -1632,7 +1632,7 @@ static struct fb_ops neofb_ops = {
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static struct fb_videomode __devinitdata mode800x480 = { static struct fb_videomode mode800x480 = {
.xres = 800, .xres = 800,
.yres = 480, .yres = 480,
.pixclock = 25000, .pixclock = 25000,
@ -1646,8 +1646,7 @@ static struct fb_videomode __devinitdata mode800x480 = {
.vmode = FB_VMODE_NONINTERLACED .vmode = FB_VMODE_NONINTERLACED
}; };
static int __devinit neo_map_mmio(struct fb_info *info, static int neo_map_mmio(struct fb_info *info, struct pci_dev *dev)
struct pci_dev *dev)
{ {
struct neofb_par *par = info->par; struct neofb_par *par = info->par;
@ -1707,8 +1706,8 @@ static void neo_unmap_mmio(struct fb_info *info)
info->fix.mmio_len); info->fix.mmio_len);
} }
static int __devinit neo_map_video(struct fb_info *info, static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
struct pci_dev *dev, int video_len) int video_len)
{ {
//unsigned long addr; //unsigned long addr;
@ -1772,7 +1771,7 @@ static void neo_unmap_video(struct fb_info *info)
info->fix.smem_len); info->fix.smem_len);
} }
static int __devinit neo_scan_monitor(struct fb_info *info) static int neo_scan_monitor(struct fb_info *info)
{ {
struct neofb_par *par = info->par; struct neofb_par *par = info->par;
unsigned char type, display; unsigned char type, display;
@ -1851,7 +1850,7 @@ static int __devinit neo_scan_monitor(struct fb_info *info)
return 0; return 0;
} }
static int __devinit neo_init_hw(struct fb_info *info) static int neo_init_hw(struct fb_info *info)
{ {
struct neofb_par *par = info->par; struct neofb_par *par = info->par;
int videoRam = 896; int videoRam = 896;
@ -1939,8 +1938,8 @@ static int __devinit neo_init_hw(struct fb_info *info)
} }
static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const struct static struct fb_info *neo_alloc_fb_info(struct pci_dev *dev,
pci_device_id *id) const struct pci_device_id *id)
{ {
struct fb_info *info; struct fb_info *info;
struct neofb_par *par; struct neofb_par *par;
@ -2038,8 +2037,7 @@ static void neo_free_fb_info(struct fb_info *info)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static int __devinit neofb_probe(struct pci_dev *dev, static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct fb_info *info; struct fb_info *info;
u_int h_sync, v_sync; u_int h_sync, v_sync;
@ -2128,7 +2126,7 @@ err_map_mmio:
return err; return err;
} }
static void __devexit neofb_remove(struct pci_dev *dev) static void neofb_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
@ -2194,7 +2192,7 @@ static struct pci_driver neofb_driver = {
.name = "neofb", .name = "neofb",
.id_table = neofb_devices, .id_table = neofb_devices,
.probe = neofb_probe, .probe = neofb_probe,
.remove = __devexit_p(neofb_remove) .remove = neofb_remove,
}; };
/* ************************* init in-kernel code ************************** */ /* ************************* init in-kernel code ************************** */

4
drivers/video/nuc900fb.c
View File

@ -387,7 +387,7 @@ static int nuc900fb_init_registers(struct fb_info *info)
* The buffer should be a non-cached, non-buffered, memory region * The buffer should be a non-cached, non-buffered, memory region
* to allow palette and pixel writes without flushing the cache. * to allow palette and pixel writes without flushing the cache.
*/ */
static int __devinit nuc900fb_map_video_memory(struct fb_info *info) static int nuc900fb_map_video_memory(struct fb_info *info)
{ {
struct nuc900fb_info *fbi = info->par; struct nuc900fb_info *fbi = info->par;
dma_addr_t map_dma; dma_addr_t map_dma;
@ -499,7 +499,7 @@ static inline void nuc900fb_cpufreq_deregister(struct nuc900fb_info *info)
static char driver_name[] = "nuc900fb"; static char driver_name[] = "nuc900fb";
static int __devinit nuc900fb_probe(struct platform_device *pdev) static int nuc900fb_probe(struct platform_device *pdev)
{ {
struct nuc900fb_info *fbi; struct nuc900fb_info *fbi;
struct nuc900fb_display *display; struct nuc900fb_display *display;

49
drivers/video/nvidia/nvidia.c
View File

@ -70,34 +70,34 @@ static struct pci_device_id nvidiafb_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl); MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl);
/* command line data, set in nvidiafb_setup() */ /* command line data, set in nvidiafb_setup() */
static int flatpanel __devinitdata = -1; /* Autodetect later */ static int flatpanel = -1; /* Autodetect later */
static int fpdither __devinitdata = -1; static int fpdither = -1;
static int forceCRTC __devinitdata = -1; static int forceCRTC = -1;
static int hwcur __devinitdata = 0; static int hwcur = 0;
static int noaccel __devinitdata = 0; static int noaccel = 0;
static int noscale __devinitdata = 0; static int noscale = 0;
static int paneltweak __devinitdata = 0; static int paneltweak = 0;
static int vram __devinitdata = 0; static int vram = 0;
static int bpp __devinitdata = 8; static int bpp = 8;
static int reverse_i2c __devinitdata; static int reverse_i2c;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static bool nomtrr __devinitdata = false; static bool nomtrr = false;
#endif #endif
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
static int backlight __devinitdata = 1; static int backlight = 1;
#else #else
static int backlight __devinitdata = 0; static int backlight = 0;
#endif #endif
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
static struct fb_fix_screeninfo __devinitdata nvidiafb_fix = { static struct fb_fix_screeninfo nvidiafb_fix = {
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.xpanstep = 8, .xpanstep = 8,
.ypanstep = 1, .ypanstep = 1,
}; };
static struct fb_var_screeninfo __devinitdata nvidiafb_default_var = { static struct fb_var_screeninfo nvidiafb_default_var = {
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
.xres_virtual = 640, .xres_virtual = 640,
@ -1105,7 +1105,7 @@ fail:
#define nvidiafb_resume NULL #define nvidiafb_resume NULL
#endif #endif
static int __devinit nvidia_set_fbinfo(struct fb_info *info) static int nvidia_set_fbinfo(struct fb_info *info)
{ {
struct fb_monspecs *specs = &info->monspecs; struct fb_monspecs *specs = &info->monspecs;
struct fb_videomode modedb; struct fb_videomode modedb;
@ -1201,7 +1201,7 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
return nvidiafb_check_var(&info->var, info); return nvidiafb_check_var(&info->var, info);
} }
static u32 __devinit nvidia_get_chipset(struct fb_info *info) static u32 nvidia_get_chipset(struct fb_info *info)
{ {
struct nvidia_par *par = info->par; struct nvidia_par *par = info->par;
u32 id = (par->pci_dev->vendor << 16) | par->pci_dev->device; 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)
return id; return id;
} }
static u32 __devinit nvidia_get_arch(struct fb_info *info) static u32 nvidia_get_arch(struct fb_info *info)
{ {
struct nvidia_par *par = info->par; struct nvidia_par *par = info->par;
u32 arch = 0; u32 arch = 0;
@ -1276,8 +1276,7 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
return arch; return arch;
} }
static int __devinit nvidiafb_probe(struct pci_dev *pd, static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct nvidia_par *par; struct nvidia_par *par;
struct fb_info *info; struct fb_info *info;
@ -1438,7 +1437,7 @@ err_out:
return -ENODEV; return -ENODEV;
} }
static void __devexit nvidiafb_remove(struct pci_dev *pd) static void nvidiafb_remove(struct pci_dev *pd)
{ {
struct fb_info *info = pci_get_drvdata(pd); struct fb_info *info = pci_get_drvdata(pd);
struct nvidia_par *par = info->par; struct nvidia_par *par = info->par;
@ -1473,7 +1472,7 @@ static void __devexit nvidiafb_remove(struct pci_dev *pd)
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
#ifndef MODULE #ifndef MODULE
static int __devinit nvidiafb_setup(char *options) static int nvidiafb_setup(char *options)
{ {
char *this_opt; char *this_opt;
@ -1529,7 +1528,7 @@ static struct pci_driver nvidiafb_driver = {
.probe = nvidiafb_probe, .probe = nvidiafb_probe,
.suspend = nvidiafb_suspend, .suspend = nvidiafb_suspend,
.resume = nvidiafb_resume, .resume = nvidiafb_resume,
.remove = __devexit_p(nvidiafb_remove), .remove = nvidiafb_remove,
}; };
/* ------------------------------------------------------------------------- * /* ------------------------------------------------------------------------- *
@ -1538,7 +1537,7 @@ static struct pci_driver nvidiafb_driver = {
* *
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
static int __devinit nvidiafb_init(void) static int nvidiafb_init(void)
{ {
#ifndef MODULE #ifndef MODULE
char *option = NULL; char *option = NULL;

2
drivers/video/omap/lcd_mipid.c
View File

@ -606,7 +606,7 @@ static struct spi_driver mipid_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = mipid_spi_probe, .probe = mipid_spi_probe,
.remove = __devexit_p(mipid_spi_remove), .remove = mipid_spi_remove,
}; };
module_spi_driver(mipid_spi_driver); module_spi_driver(mipid_spi_driver);

2
drivers/video/omap2/displays/panel-acx565akm.c
View File

@ -777,7 +777,7 @@ static struct spi_driver acx565akm_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = acx565akm_spi_probe, .probe = acx565akm_spi_probe,
.remove = __devexit_p(acx565akm_spi_remove), .remove = acx565akm_spi_remove,
}; };
module_spi_driver(acx565akm_spi_driver); module_spi_driver(acx565akm_spi_driver);

6
drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
View File

@ -216,13 +216,13 @@ static void init_lb035q02_panel(struct spi_device *spi)
lb035q02_write_reg(spi, 0x3b, 0x0806); lb035q02_write_reg(spi, 0x3b, 0x0806);
} }
static int __devinit lb035q02_panel_spi_probe(struct spi_device *spi) static int lb035q02_panel_spi_probe(struct spi_device *spi)
{ {
init_lb035q02_panel(spi); init_lb035q02_panel(spi);
return omap_dss_register_driver(&lb035q02_driver); return omap_dss_register_driver(&lb035q02_driver);
} }
static int __devexit lb035q02_panel_spi_remove(struct spi_device *spi) static int lb035q02_panel_spi_remove(struct spi_device *spi)
{ {
omap_dss_unregister_driver(&lb035q02_driver); omap_dss_unregister_driver(&lb035q02_driver);
return 0; return 0;
@ -234,7 +234,7 @@ static struct spi_driver lb035q02_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = lb035q02_panel_spi_probe, .probe = lb035q02_panel_spi_probe,
.remove = __devexit_p(lb035q02_panel_spi_remove), .remove = lb035q02_panel_spi_remove,
}; };
module_spi_driver(lb035q02_spi_driver); module_spi_driver(lb035q02_spi_driver);

2
drivers/video/omap2/displays/panel-n8x0.c
View File

@ -680,7 +680,7 @@ static struct spi_driver mipid_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = mipid_spi_probe, .probe = mipid_spi_probe,
.remove = __devexit_p(mipid_spi_remove), .remove = mipid_spi_remove,
}; };
module_spi_driver(mipid_spi_driver); module_spi_driver(mipid_spi_driver);

2
drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
View File

@ -323,7 +323,7 @@ static int nec_8048_spi_resume(struct spi_device *spi)
static struct spi_driver nec_8048_spi_driver = { static struct spi_driver nec_8048_spi_driver = {
.probe = nec_8048_spi_probe, .probe = nec_8048_spi_probe,
.remove = __devexit_p(nec_8048_spi_remove), .remove = nec_8048_spi_remove,
.suspend = nec_8048_spi_suspend, .suspend = nec_8048_spi_suspend,
.resume = nec_8048_spi_resume, .resume = nec_8048_spi_resume,
.driver = { .driver = {

4
drivers/video/omap2/displays/panel-tpo-td043mtea1.c
View File

@ -528,7 +528,7 @@ static int tpo_td043_spi_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __devexit tpo_td043_spi_remove(struct spi_device *spi) static int tpo_td043_spi_remove(struct spi_device *spi)
{ {
struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&spi->dev); struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&spi->dev);
@ -580,7 +580,7 @@ static struct spi_driver tpo_td043_spi_driver = {
.pm = &tpo_td043_spi_pm, .pm = &tpo_td043_spi_pm,
}, },
.probe = tpo_td043_spi_probe, .probe = tpo_td043_spi_probe,
.remove = __devexit_p(tpo_td043_spi_remove), .remove = tpo_td043_spi_remove,
}; };
module_spi_driver(tpo_td043_spi_driver); module_spi_driver(tpo_td043_spi_driver);

6
drivers/video/p9100.c
View File

@ -249,7 +249,7 @@ static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_no
info->fix.accel = FB_ACCEL_SUN_CGTHREE; info->fix.accel = FB_ACCEL_SUN_CGTHREE;
} }
static int __devinit p9100_probe(struct platform_device *op) static int p9100_probe(struct platform_device *op)
{ {
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -326,7 +326,7 @@ out_err:
return err; return err;
} }
static int __devexit p9100_remove(struct platform_device *op) static int p9100_remove(struct platform_device *op)
{ {
struct fb_info *info = dev_get_drvdata(&op->dev); struct fb_info *info = dev_get_drvdata(&op->dev);
struct p9100_par *par = info->par; struct p9100_par *par = info->par;
@ -359,7 +359,7 @@ static struct platform_driver p9100_driver = {
.of_match_table = p9100_match, .of_match_table = p9100_match,
}, },
.probe = p9100_probe, .probe = p9100_probe,
.remove = __devexit_p(p9100_remove), .remove = p9100_remove,
}; };
static int __init p9100_init(void) static int __init p9100_init(void)

11
drivers/video/platinumfb.c
View File

@ -313,7 +313,8 @@ static void platinum_set_hardware(struct fb_info_platinum *pinfo)
/* /*
* Set misc info vars for this driver * Set misc info vars for this driver
*/ */
static void __devinit platinum_init_info(struct fb_info *info, struct fb_info_platinum *pinfo) static void platinum_init_info(struct fb_info *info,
struct fb_info_platinum *pinfo)
{ {
/* Fill fb_info */ /* Fill fb_info */
info->fbops = &platinumfb_ops; info->fbops = &platinumfb_ops;
@ -338,7 +339,7 @@ static void __devinit platinum_init_info(struct fb_info *info, struct fb_info_pl
} }
static int __devinit platinum_init_fb(struct fb_info *info) static int platinum_init_fb(struct fb_info *info)
{ {
struct fb_info_platinum *pinfo = info->par; struct fb_info_platinum *pinfo = info->par;
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
@ -533,7 +534,7 @@ static int __init platinumfb_setup(char *options)
#define invalidate_cache(addr) #define invalidate_cache(addr)
#endif #endif
static int __devinit platinumfb_probe(struct platform_device* odev) static int platinumfb_probe(struct platform_device* odev)
{ {
struct device_node *dp = odev->dev.of_node; struct device_node *dp = odev->dev.of_node;
struct fb_info *info; struct fb_info *info;
@ -645,7 +646,7 @@ static int __devinit platinumfb_probe(struct platform_device* odev)
return rc; return rc;
} }
static int __devexit platinumfb_remove(struct platform_device* odev) static int platinumfb_remove(struct platform_device* odev)
{ {
struct fb_info *info = dev_get_drvdata(&odev->dev); struct fb_info *info = dev_get_drvdata(&odev->dev);
struct fb_info_platinum *pinfo = info->par; struct fb_info_platinum *pinfo = info->par;
@ -683,7 +684,7 @@ static struct platform_driver platinum_driver =
.of_match_table = platinumfb_match, .of_match_table = platinumfb_match,
}, },
.probe = platinumfb_probe, .probe = platinumfb_probe,
.remove = __devexit_p(platinumfb_remove), .remove = platinumfb_remove,
}; };
static int __init platinumfb_init(void) static int __init platinumfb_init(void)

17
drivers/video/pm2fb.c
View File

@ -67,7 +67,7 @@
* Driver data * Driver data
*/ */
static int hwcursor = 1; static int hwcursor = 1;
static char *mode_option __devinitdata; static char *mode_option;
/* /*
* The XFree GLINT driver will (I think to implement hardware cursor * The XFree GLINT driver will (I think to implement hardware cursor
@ -80,10 +80,10 @@ static char *mode_option __devinitdata;
*/ */
static bool lowhsync; static bool lowhsync;
static bool lowvsync; static bool lowvsync;
static bool noaccel __devinitdata; static bool noaccel;
/* mtrr option */ /* mtrr option */
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static bool nomtrr __devinitdata; static bool nomtrr;
#endif #endif
/* /*
@ -107,7 +107,7 @@ struct pm2fb_par
* Here we define the default structs fb_fix_screeninfo and fb_var_screeninfo * Here we define the default structs fb_fix_screeninfo and fb_var_screeninfo
* if we don't use modedb. * if we don't use modedb.
*/ */
static struct fb_fix_screeninfo pm2fb_fix __devinitdata = { static struct fb_fix_screeninfo pm2fb_fix = {
.id = "", .id = "",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -120,7 +120,7 @@ static struct fb_fix_screeninfo pm2fb_fix __devinitdata = {
/* /*
* Default video mode. In case the modedb doesn't work. * Default video mode. In case the modedb doesn't work.
*/ */
static struct fb_var_screeninfo pm2fb_var __devinitdata = { static struct fb_var_screeninfo pm2fb_var = {
/* "640x480, 8 bpp @ 60 Hz */ /* "640x480, 8 bpp @ 60 Hz */
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -1515,8 +1515,7 @@ static struct fb_ops pm2fb_ops = {
* @param pdev PCI device. * @param pdev PCI device.
* @param id PCI device ID. * @param id PCI device ID.
*/ */
static int __devinit pm2fb_probe(struct pci_dev *pdev, static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct pm2fb_par *default_par; struct pm2fb_par *default_par;
struct fb_info *info; struct fb_info *info;
@ -1727,7 +1726,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
* *
* @param pdev PCI device to clean up. * @param pdev PCI device to clean up.
*/ */
static void __devexit pm2fb_remove(struct pci_dev *pdev) static void pm2fb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct fb_fix_screeninfo *fix = &info->fix; struct fb_fix_screeninfo *fix = &info->fix;
@ -1765,7 +1764,7 @@ static struct pci_driver pm2fb_driver = {
.name = "pm2fb", .name = "pm2fb",
.id_table = pm2fb_id_table, .id_table = pm2fb_id_table,
.probe = pm2fb_probe, .probe = pm2fb_probe,
.remove = __devexit_p(pm2fb_remove), .remove = pm2fb_remove,
}; };
MODULE_DEVICE_TABLE(pci, pm2fb_id_table); MODULE_DEVICE_TABLE(pci, pm2fb_id_table);

17
drivers/video/pm3fb.c
View File

@ -56,12 +56,12 @@
* Driver data * Driver data
*/ */
static int hwcursor = 1; static int hwcursor = 1;
static char *mode_option __devinitdata; static char *mode_option;
static bool noaccel __devinitdata; static bool noaccel;
/* mtrr option */ /* mtrr option */
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static bool nomtrr __devinitdata; static bool nomtrr;
#endif #endif
/* /*
@ -84,7 +84,7 @@ struct pm3_par {
* if we don't use modedb. If we do use modedb see pm3fb_init how to use it * if we don't use modedb. If we do use modedb see pm3fb_init how to use it
* to get a fb_var_screeninfo. Otherwise define a default var as well. * to get a fb_var_screeninfo. Otherwise define a default var as well.
*/ */
static struct fb_fix_screeninfo pm3fb_fix __devinitdata = { static struct fb_fix_screeninfo pm3fb_fix = {
.id = "Permedia3", .id = "Permedia3",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -1229,7 +1229,7 @@ static struct fb_ops pm3fb_ops = {
/* mmio register are already mapped when this function is called */ /* mmio register are already mapped when this function is called */
/* the pm3fb_fix.smem_start is also set */ /* the pm3fb_fix.smem_start is also set */
static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par) static unsigned long pm3fb_size_memory(struct pm3_par *par)
{ {
unsigned long memsize = 0; unsigned long memsize = 0;
unsigned long tempBypass, i, temp1, temp2; unsigned long tempBypass, i, temp1, temp2;
@ -1314,8 +1314,7 @@ static unsigned long __devinit pm3fb_size_memory(struct pm3_par *par)
return memsize; return memsize;
} }
static int __devinit pm3fb_probe(struct pci_dev *dev, static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
struct pm3_par *par; struct pm3_par *par;
@ -1469,7 +1468,7 @@ static int __devinit pm3fb_probe(struct pci_dev *dev,
/* /*
* Cleanup * Cleanup
*/ */
static void __devexit pm3fb_remove(struct pci_dev *dev) static void pm3fb_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
@ -1507,7 +1506,7 @@ static struct pci_driver pm3fb_driver = {
.name = "pm3fb", .name = "pm3fb",
.id_table = pm3fb_id_table, .id_table = pm3fb_id_table,
.probe = pm3fb_probe, .probe = pm3fb_probe,
.remove = __devexit_p(pm3fb_remove), .remove = pm3fb_remove,
}; };
MODULE_DEVICE_TABLE(pci, pm3fb_id_table); MODULE_DEVICE_TABLE(pci, pm3fb_id_table);

6
drivers/video/pmag-ba-fb.c
View File

@ -43,7 +43,7 @@ struct pmagbafb_par {
}; };
static struct fb_var_screeninfo pmagbafb_defined __devinitdata = { static struct fb_var_screeninfo pmagbafb_defined = {
.xres = 1024, .xres = 1024,
.yres = 864, .yres = 864,
.xres_virtual = 1024, .xres_virtual = 1024,
@ -67,7 +67,7 @@ static struct fb_var_screeninfo pmagbafb_defined __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo pmagbafb_fix __devinitdata = { static struct fb_fix_screeninfo pmagbafb_fix = {
.id = "PMAG-BA", .id = "PMAG-BA",
.smem_len = (1024 * 1024), .smem_len = (1024 * 1024),
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
@ -141,7 +141,7 @@ static void __init pmagbafb_erase_cursor(struct fb_info *info)
} }
static int __devinit pmagbafb_probe(struct device *dev) static int pmagbafb_probe(struct device *dev)
{ {
struct tc_dev *tdev = to_tc_dev(dev); struct tc_dev *tdev = to_tc_dev(dev);
resource_size_t start, len; resource_size_t start, len;

12
drivers/video/pmagb-b-fb.c
View File

@ -44,7 +44,7 @@ struct pmagbbfb_par {
}; };
static struct fb_var_screeninfo pmagbbfb_defined __devinitdata = { static struct fb_var_screeninfo pmagbbfb_defined = {
.bits_per_pixel = 8, .bits_per_pixel = 8,
.red.length = 8, .red.length = 8,
.green.length = 8, .green.length = 8,
@ -57,7 +57,7 @@ static struct fb_var_screeninfo pmagbbfb_defined __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo pmagbbfb_fix __devinitdata = { static struct fb_fix_screeninfo pmagbbfb_fix = {
.id = "PMAGB-BA", .id = "PMAGB-BA",
.smem_len = (2048 * 1024), .smem_len = (2048 * 1024),
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
@ -147,7 +147,7 @@ static void __init pmagbbfb_erase_cursor(struct fb_info *info)
/* /*
* Set up screen parameters. * Set up screen parameters.
*/ */
static void __devinit pmagbbfb_screen_setup(struct fb_info *info) static void pmagbbfb_screen_setup(struct fb_info *info)
{ {
struct pmagbbfb_par *par = info->par; struct pmagbbfb_par *par = info->par;
@ -179,9 +179,9 @@ static void __devinit pmagbbfb_screen_setup(struct fb_info *info)
/* /*
* Determine oscillator configuration. * Determine oscillator configuration.
*/ */
static void __devinit pmagbbfb_osc_setup(struct fb_info *info) static void pmagbbfb_osc_setup(struct fb_info *info)
{ {
static unsigned int pmagbbfb_freqs[] __devinitdata = { static unsigned int pmagbbfb_freqs[] = {
130808, 119843, 104000, 92980, 74370, 72800, 130808, 119843, 104000, 92980, 74370, 72800,
69197, 66000, 65000, 50350, 36000, 32000, 25175 69197, 66000, 65000, 50350, 36000, 32000, 25175
}; };
@ -246,7 +246,7 @@ static void __devinit pmagbbfb_osc_setup(struct fb_info *info)
}; };
static int __devinit pmagbbfb_probe(struct device *dev) static int pmagbbfb_probe(struct device *dev)
{ {
struct tc_dev *tdev = to_tc_dev(dev); struct tc_dev *tdev = to_tc_dev(dev);
resource_size_t start, len; resource_size_t start, len;

4
drivers/video/ps3fb.c
View File

@ -259,7 +259,7 @@ static const struct fb_videomode ps3fb_modedb[] = {
static int ps3fb_mode; static int ps3fb_mode;
module_param(ps3fb_mode, int, 0); module_param(ps3fb_mode, int, 0);
static char *mode_option __devinitdata; static char *mode_option;
static int ps3fb_cmp_mode(const struct fb_videomode *vmode, static int ps3fb_cmp_mode(const struct fb_videomode *vmode,
const struct fb_var_screeninfo *var) const struct fb_var_screeninfo *var)
@ -965,7 +965,7 @@ static struct fb_fix_screeninfo ps3fb_fix __initdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) static int ps3fb_probe(struct ps3_system_bus_device *dev)
{ {
struct fb_info *info; struct fb_info *info;
struct ps3fb_par *par; struct ps3fb_par *par;

26
drivers/video/pvr2fb.c
View File

@ -112,11 +112,11 @@ enum { VO_PAL, VO_NTSC, VO_VGA };
enum { PAL_ARGB1555, PAL_RGB565, PAL_ARGB4444, PAL_ARGB8888 }; enum { PAL_ARGB1555, PAL_RGB565, PAL_ARGB4444, PAL_ARGB8888 };
struct pvr2_params { unsigned int val; char *name; }; struct pvr2_params { unsigned int val; char *name; };
static struct pvr2_params cables[] __devinitdata = { static struct pvr2_params cables[] = {
{ CT_VGA, "VGA" }, { CT_RGB, "RGB" }, { CT_COMPOSITE, "COMPOSITE" }, { CT_VGA, "VGA" }, { CT_RGB, "RGB" }, { CT_COMPOSITE, "COMPOSITE" },
}; };
static struct pvr2_params outputs[] __devinitdata = { static struct pvr2_params outputs[] = {
{ VO_PAL, "PAL" }, { VO_NTSC, "NTSC" }, { VO_VGA, "VGA" }, { VO_PAL, "PAL" }, { VO_NTSC, "NTSC" }, { VO_VGA, "VGA" },
}; };
@ -145,7 +145,7 @@ static struct pvr2fb_par {
static struct fb_info *fb_info; static struct fb_info *fb_info;
static struct fb_fix_screeninfo pvr2_fix __devinitdata = { static struct fb_fix_screeninfo pvr2_fix = {
.id = "NEC PowerVR2", .id = "NEC PowerVR2",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
@ -154,7 +154,7 @@ static struct fb_fix_screeninfo pvr2_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo pvr2_var __devinitdata = { static struct fb_var_screeninfo pvr2_var = {
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
.xres_virtual = 640, .xres_virtual = 640,
@ -226,7 +226,7 @@ static struct fb_ops pvr2fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static struct fb_videomode pvr2_modedb[] __devinitdata = { static struct fb_videomode pvr2_modedb[] = {
/* /*
* Broadcast video modes (PAL and NTSC). I'm unfamiliar with * Broadcast video modes (PAL and NTSC). I'm unfamiliar with
* PAL-M and PAL-N, but from what I've read both modes parallel PAL and * 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 = {
#define DEFMODE_VGA 2 #define DEFMODE_VGA 2
static int defmode = DEFMODE_NTSC; static int defmode = DEFMODE_NTSC;
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
static inline void pvr2fb_set_pal_type(unsigned int type) static inline void pvr2fb_set_pal_type(unsigned int type)
{ {
@ -763,7 +763,7 @@ out_unmap:
* in for flexibility anyways. Who knows, maybe someone has tv-out on a * in for flexibility anyways. Who knows, maybe someone has tv-out on a
* PCI-based version of these things ;-) * PCI-based version of these things ;-)
*/ */
static int __devinit pvr2fb_common_init(void) static int pvr2fb_common_init(void)
{ {
struct pvr2fb_par *par = currentpar; struct pvr2fb_par *par = currentpar;
unsigned long modememused, rev; unsigned long modememused, rev;
@ -922,7 +922,7 @@ static void __exit pvr2fb_dc_exit(void)
#endif /* CONFIG_SH_DREAMCAST */ #endif /* CONFIG_SH_DREAMCAST */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __devinit pvr2fb_pci_probe(struct pci_dev *pdev, static int pvr2fb_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int ret; int ret;
@ -953,7 +953,7 @@ static int __devinit pvr2fb_pci_probe(struct pci_dev *pdev,
return pvr2fb_common_init(); return pvr2fb_common_init();
} }
static void __devexit pvr2fb_pci_remove(struct pci_dev *pdev) static void pvr2fb_pci_remove(struct pci_dev *pdev)
{ {
if (fb_info->screen_base) { if (fb_info->screen_base) {
iounmap(fb_info->screen_base); iounmap(fb_info->screen_base);
@ -967,7 +967,7 @@ static void __devexit pvr2fb_pci_remove(struct pci_dev *pdev)
pci_release_regions(pdev); pci_release_regions(pdev);
} }
static struct pci_device_id pvr2fb_pci_tbl[] __devinitdata = { static struct pci_device_id pvr2fb_pci_tbl[] = {
{ PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NEON250, { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NEON250,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0, }, { 0, },
@ -979,7 +979,7 @@ static struct pci_driver pvr2fb_pci_driver = {
.name = "pvr2fb", .name = "pvr2fb",
.id_table = pvr2fb_pci_tbl, .id_table = pvr2fb_pci_tbl,
.probe = pvr2fb_pci_probe, .probe = pvr2fb_pci_probe,
.remove = __devexit_p(pvr2fb_pci_remove), .remove = pvr2fb_pci_remove,
}; };
static int __init pvr2fb_pci_init(void) static int __init pvr2fb_pci_init(void)
@ -993,8 +993,8 @@ static void __exit pvr2fb_pci_exit(void)
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
static int __devinit pvr2_get_param(const struct pvr2_params *p, const char *s, static int pvr2_get_param(const struct pvr2_params *p, const char *s, int val,
int val, int size) int size)
{ {
int i; int i;

8
drivers/video/pxa168fb.c
View File

@ -560,7 +560,7 @@ static struct fb_ops pxa168fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int __devinit pxa168fb_init_mode(struct fb_info *info, static int pxa168fb_init_mode(struct fb_info *info,
struct pxa168fb_mach_info *mi) struct pxa168fb_mach_info *mi)
{ {
struct pxa168fb_info *fbi = info->par; struct pxa168fb_info *fbi = info->par;
@ -600,7 +600,7 @@ static int __devinit pxa168fb_init_mode(struct fb_info *info,
return ret; return ret;
} }
static int __devinit pxa168fb_probe(struct platform_device *pdev) static int pxa168fb_probe(struct platform_device *pdev)
{ {
struct pxa168fb_mach_info *mi; struct pxa168fb_mach_info *mi;
struct fb_info *info = 0; struct fb_info *info = 0;
@ -783,7 +783,7 @@ failed_put_clk:
return ret; return ret;
} }
static int __devexit pxa168fb_remove(struct platform_device *pdev) static int pxa168fb_remove(struct platform_device *pdev)
{ {
struct pxa168fb_info *fbi = platform_get_drvdata(pdev); struct pxa168fb_info *fbi = platform_get_drvdata(pdev);
struct fb_info *info; struct fb_info *info;
@ -826,7 +826,7 @@ static struct platform_driver pxa168fb_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = pxa168fb_probe, .probe = pxa168fb_probe,
.remove = __devexit_p(pxa168fb_remove), .remove = pxa168fb_remove,
}; };
module_platform_driver(pxa168fb_driver); module_platform_driver(pxa168fb_driver);

8
drivers/video/pxa3xx-gcu.c
View File

@ -574,8 +574,7 @@ free_buffers(struct platform_device *dev,
priv->free = NULL; priv->free = NULL;
} }
static int __devinit static int pxa3xx_gcu_probe(struct platform_device *dev)
pxa3xx_gcu_probe(struct platform_device *dev)
{ {
int i, ret, irq; int i, ret, irq;
struct resource *r; struct resource *r;
@ -714,8 +713,7 @@ err_free_priv:
return ret; return ret;
} }
static int __devexit static int pxa3xx_gcu_remove(struct platform_device *dev)
pxa3xx_gcu_remove(struct platform_device *dev)
{ {
struct pxa3xx_gcu_priv *priv = platform_get_drvdata(dev); struct pxa3xx_gcu_priv *priv = platform_get_drvdata(dev);
struct resource *r = priv->resource_mem; struct resource *r = priv->resource_mem;
@ -737,7 +735,7 @@ pxa3xx_gcu_remove(struct platform_device *dev)
static struct platform_driver pxa3xx_gcu_driver = { static struct platform_driver pxa3xx_gcu_driver = {
.probe = pxa3xx_gcu_probe, .probe = pxa3xx_gcu_probe,
.remove = __devexit_p(pxa3xx_gcu_remove), .remove = pxa3xx_gcu_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,

31
drivers/video/pxafb.c
View File

@ -869,8 +869,8 @@ static struct fb_ops overlay_fb_ops = {
.fb_set_par = overlayfb_set_par, .fb_set_par = overlayfb_set_par,
}; };
static void __devinit init_pxafb_overlay(struct pxafb_info *fbi, static void init_pxafb_overlay(struct pxafb_info *fbi, struct pxafb_layer *ofb,
struct pxafb_layer *ofb, int id) int id)
{ {
sprintf(ofb->fb.fix.id, "overlay%d", id + 1); sprintf(ofb->fb.fix.id, "overlay%d", id + 1);
@ -903,7 +903,7 @@ static inline int pxafb_overlay_supported(void)
return 0; return 0;
} }
static int __devinit pxafb_overlay_map_video_memory(struct pxafb_info *pxafb, static int pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
struct pxafb_layer *ofb) struct pxafb_layer *ofb)
{ {
/* We assume that user will use at most video_mem_size for overlay fb, /* We assume that user will use at most video_mem_size for overlay fb,
@ -927,7 +927,7 @@ static int __devinit pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
return 0; return 0;
} }
static void __devinit pxafb_overlay_init(struct pxafb_info *fbi) static void pxafb_overlay_init(struct pxafb_info *fbi)
{ {
int i, ret; int i, ret;
@ -959,7 +959,7 @@ static void __devinit pxafb_overlay_init(struct pxafb_info *fbi)
pr_info("PXA Overlay driver loaded successfully!\n"); pr_info("PXA Overlay driver loaded successfully!\n");
} }
static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi) static void pxafb_overlay_exit(struct pxafb_info *fbi)
{ {
int i; int i;
@ -1706,7 +1706,7 @@ static const struct dev_pm_ops pxafb_pm_ops = {
}; };
#endif #endif
static int __devinit pxafb_init_video_memory(struct pxafb_info *fbi) static int pxafb_init_video_memory(struct pxafb_info *fbi)
{ {
int size = PAGE_ALIGN(fbi->video_mem_size); int size = PAGE_ALIGN(fbi->video_mem_size);
@ -1789,7 +1789,7 @@ decode_mode:
fbi->video_mem_size = video_mem_size; fbi->video_mem_size = video_mem_size;
} }
static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) static struct pxafb_info *pxafb_init_fbinfo(struct device *dev)
{ {
struct pxafb_info *fbi; struct pxafb_info *fbi;
void *addr; void *addr;
@ -1853,7 +1853,7 @@ static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
} }
#ifdef CONFIG_FB_PXA_PARAMETERS #ifdef CONFIG_FB_PXA_PARAMETERS
static int __devinit parse_opt_mode(struct device *dev, const char *this_opt) static int parse_opt_mode(struct device *dev, const char *this_opt)
{ {
struct pxafb_mach_info *inf = dev->platform_data; struct pxafb_mach_info *inf = dev->platform_data;
@ -1912,7 +1912,7 @@ done:
return 0; return 0;
} }
static int __devinit parse_opt(struct device *dev, char *this_opt) static int parse_opt(struct device *dev, char *this_opt)
{ {
struct pxafb_mach_info *inf = dev->platform_data; struct pxafb_mach_info *inf = dev->platform_data;
struct pxafb_mode_info *mode = &inf->modes[0]; struct pxafb_mode_info *mode = &inf->modes[0];
@ -2012,7 +2012,7 @@ static int __devinit parse_opt(struct device *dev, char *this_opt)
return 0; return 0;
} }
static int __devinit pxafb_parse_options(struct device *dev, char *options) static int pxafb_parse_options(struct device *dev, char *options)
{ {
char *this_opt; char *this_opt;
int ret; int ret;
@ -2031,7 +2031,7 @@ static int __devinit pxafb_parse_options(struct device *dev, char *options)
return 0; return 0;
} }
static char g_options[256] __devinitdata = ""; static char g_options[256] = "";
#ifndef MODULE #ifndef MODULE
static int __init pxafb_setup_options(void) static int __init pxafb_setup_options(void)
@ -2061,8 +2061,7 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
#ifdef DEBUG_VAR #ifdef DEBUG_VAR
/* Check for various illegal bit-combinations. Currently only /* Check for various illegal bit-combinations. Currently only
* a warning is given. */ * a warning is given. */
static void __devinit pxafb_check_options(struct device *dev, static void pxafb_check_options(struct device *dev, struct pxafb_mach_info *inf)
struct pxafb_mach_info *inf)
{ {
if (inf->lcd_conn) if (inf->lcd_conn)
return; return;
@ -2094,7 +2093,7 @@ static void __devinit pxafb_check_options(struct device *dev,
#define pxafb_check_options(...) do {} while (0) #define pxafb_check_options(...) do {} while (0)
#endif #endif
static int __devinit pxafb_probe(struct platform_device *dev) static int pxafb_probe(struct platform_device *dev)
{ {
struct pxafb_info *fbi; struct pxafb_info *fbi;
struct pxafb_mach_info *inf; struct pxafb_mach_info *inf;
@ -2263,7 +2262,7 @@ failed:
return ret; return ret;
} }
static int __devexit pxafb_remove(struct platform_device *dev) static int pxafb_remove(struct platform_device *dev)
{ {
struct pxafb_info *fbi = platform_get_drvdata(dev); struct pxafb_info *fbi = platform_get_drvdata(dev);
struct resource *r; struct resource *r;
@ -2304,7 +2303,7 @@ static int __devexit pxafb_remove(struct platform_device *dev)
static struct platform_driver pxafb_driver = { static struct platform_driver pxafb_driver = {
.probe = pxafb_probe, .probe = pxafb_probe,
.remove = __devexit_p(pxafb_remove), .remove = pxafb_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "pxa2xx-fb", .name = "pxa2xx-fb",

6
drivers/video/q40fb.c
View File

@ -27,7 +27,7 @@
#define Q40_PHYS_SCREEN_ADDR 0xFE800000 #define Q40_PHYS_SCREEN_ADDR 0xFE800000
static struct fb_fix_screeninfo q40fb_fix __devinitdata = { static struct fb_fix_screeninfo q40fb_fix = {
.id = "Q40", .id = "Q40",
.smem_len = 1024*1024, .smem_len = 1024*1024,
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
@ -36,7 +36,7 @@ static struct fb_fix_screeninfo q40fb_fix __devinitdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo q40fb_var __devinitdata = { static struct fb_var_screeninfo q40fb_var = {
.xres = 1024, .xres = 1024,
.yres = 512, .yres = 512,
.xres_virtual = 1024, .xres_virtual = 1024,
@ -83,7 +83,7 @@ static struct fb_ops q40fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int __devinit q40fb_probe(struct platform_device *dev) static int q40fb_probe(struct platform_device *dev)
{ {
struct fb_info *info; struct fb_info *info;

43
drivers/video/riva/fbdev.c
View File

@ -205,28 +205,28 @@ MODULE_DEVICE_TABLE(pci, rivafb_pci_tbl);
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
/* command line data, set in rivafb_setup() */ /* command line data, set in rivafb_setup() */
static int flatpanel __devinitdata = -1; /* Autodetect later */ static int flatpanel = -1; /* Autodetect later */
static int forceCRTC __devinitdata = -1; static int forceCRTC = -1;
static bool noaccel __devinitdata = 0; static bool noaccel = 0;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static bool nomtrr __devinitdata = 0; static bool nomtrr = 0;
#endif #endif
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
static int backlight __devinitdata = 1; static int backlight = 1;
#else #else
static int backlight __devinitdata = 0; static int backlight = 0;
#endif #endif
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
static bool strictmode = 0; static bool strictmode = 0;
static struct fb_fix_screeninfo __devinitdata rivafb_fix = { static struct fb_fix_screeninfo rivafb_fix = {
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.xpanstep = 1, .xpanstep = 1,
.ypanstep = 1, .ypanstep = 1,
}; };
static struct fb_var_screeninfo __devinitdata rivafb_default_var = { static struct fb_var_screeninfo rivafb_default_var = {
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
.xres_virtual = 640, .xres_virtual = 640,
@ -1709,7 +1709,7 @@ static struct fb_ops riva_fb_ops = {
.fb_sync = rivafb_sync, .fb_sync = rivafb_sync,
}; };
static int __devinit riva_set_fbinfo(struct fb_info *info) static int riva_set_fbinfo(struct fb_info *info)
{ {
unsigned int cmap_len; unsigned int cmap_len;
struct riva_par *par = info->par; struct riva_par *par = info->par;
@ -1747,7 +1747,7 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
} }
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
{ {
struct riva_par *par = info->par; struct riva_par *par = info->par;
struct device_node *dp; struct device_node *dp;
@ -1780,7 +1780,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
#endif /* CONFIG_PPC_OF */ #endif /* CONFIG_PPC_OF */
#if defined(CONFIG_FB_RIVA_I2C) && !defined(CONFIG_PPC_OF) #if defined(CONFIG_FB_RIVA_I2C) && !defined(CONFIG_PPC_OF)
static int __devinit riva_get_EDID_i2c(struct fb_info *info) static int riva_get_EDID_i2c(struct fb_info *info)
{ {
struct riva_par *par = info->par; struct riva_par *par = info->par;
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
@ -1803,7 +1803,7 @@ static int __devinit riva_get_EDID_i2c(struct fb_info *info)
} }
#endif /* CONFIG_FB_RIVA_I2C */ #endif /* CONFIG_FB_RIVA_I2C */
static void __devinit riva_update_default_var(struct fb_var_screeninfo *var, static void riva_update_default_var(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
struct fb_monspecs *specs = &info->monspecs; struct fb_monspecs *specs = &info->monspecs;
@ -1836,7 +1836,7 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,
} }
static void __devinit riva_get_EDID(struct fb_info *info, struct pci_dev *pdev) static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
{ {
NVTRACE_ENTER(); NVTRACE_ENTER();
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
@ -1850,7 +1850,7 @@ static void __devinit riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
} }
static void __devinit riva_get_edidinfo(struct fb_info *info) static void riva_get_edidinfo(struct fb_info *info)
{ {
struct fb_var_screeninfo *var = &rivafb_default_var; struct fb_var_screeninfo *var = &rivafb_default_var;
struct riva_par *par = info->par; struct riva_par *par = info->par;
@ -1871,7 +1871,7 @@ static void __devinit riva_get_edidinfo(struct fb_info *info)
* *
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
static u32 __devinit riva_get_arch(struct pci_dev *pd) static u32 riva_get_arch(struct pci_dev *pd)
{ {
u32 arch = 0; u32 arch = 0;
@ -1909,8 +1909,7 @@ static u32 __devinit riva_get_arch(struct pci_dev *pd)
return arch; return arch;
} }
static int __devinit rivafb_probe(struct pci_dev *pd, static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct riva_par *default_par; struct riva_par *default_par;
struct fb_info *info; struct fb_info *info;
@ -2105,7 +2104,7 @@ err_ret:
return ret; return ret;
} }
static void __devexit rivafb_remove(struct pci_dev *pd) static void rivafb_remove(struct pci_dev *pd)
{ {
struct fb_info *info = pci_get_drvdata(pd); struct fb_info *info = pci_get_drvdata(pd);
struct riva_par *par = info->par; struct riva_par *par = info->par;
@ -2145,7 +2144,7 @@ static void __devexit rivafb_remove(struct pci_dev *pd)
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
#ifndef MODULE #ifndef MODULE
static int __devinit rivafb_setup(char *options) static int rivafb_setup(char *options)
{ {
char *this_opt; char *this_opt;
@ -2186,7 +2185,7 @@ static struct pci_driver rivafb_driver = {
.name = "rivafb", .name = "rivafb",
.id_table = rivafb_pci_tbl, .id_table = rivafb_pci_tbl,
.probe = rivafb_probe, .probe = rivafb_probe,
.remove = __devexit_p(rivafb_remove), .remove = rivafb_remove,
}; };
@ -2197,7 +2196,7 @@ static struct pci_driver rivafb_driver = {
* *
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
static int __devinit rivafb_init(void) static int rivafb_init(void)
{ {
#ifndef MODULE #ifndef MODULE
char *option = NULL; char *option = NULL;

7
drivers/video/riva/rivafb-i2c.c
View File

@ -86,8 +86,7 @@ static int riva_gpio_getsda(void* data)
return val; return val;
} }
static int __devinit riva_setup_i2c_bus(struct riva_i2c_chan *chan, static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name,
const char *name,
unsigned int i2c_class) unsigned int i2c_class)
{ {
int rc; int rc;
@ -124,7 +123,7 @@ static int __devinit riva_setup_i2c_bus(struct riva_i2c_chan *chan,
return rc; return rc;
} }
void __devinit riva_create_i2c_busses(struct riva_par *par) void riva_create_i2c_busses(struct riva_par *par)
{ {
par->chan[0].par = par; par->chan[0].par = par;
par->chan[1].par = par; par->chan[1].par = par;
@ -150,7 +149,7 @@ void riva_delete_i2c_busses(struct riva_par *par)
} }
} }
int __devinit riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid) int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
{ {
u8 *edid = NULL; u8 *edid = NULL;

10
drivers/video/s1d13xxxfb.c
View File

@ -84,7 +84,7 @@ static const char *s1d13xxxfb_prod_names[] = {
/* /*
* here we define the default struct fb_fix_screeninfo * here we define the default struct fb_fix_screeninfo
*/ */
static struct fb_fix_screeninfo __devinitdata s1d13xxxfb_fix = { static struct fb_fix_screeninfo s1d13xxxfb_fix = {
.id = S1D_FBID, .id = S1D_FBID,
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -622,7 +622,7 @@ static struct fb_ops s1d13xxxfb_fbops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int s1d13xxxfb_width_tab[2][4] __devinitdata = { static int s1d13xxxfb_width_tab[2][4] = {
{4, 8, 16, -1}, {4, 8, 16, -1},
{9, 12, 18, -1}, {9, 12, 18, -1},
}; };
@ -642,8 +642,7 @@ static int s1d13xxxfb_width_tab[2][4] __devinitdata = {
* Note: some of the hardcoded values here might need some love to * Note: some of the hardcoded values here might need some love to
* work on various chips, and might need to no longer be hardcoded. * work on various chips, and might need to no longer be hardcoded.
*/ */
static void __devinit static void s1d13xxxfb_fetch_hw_state(struct fb_info *info)
s1d13xxxfb_fetch_hw_state(struct fb_info *info)
{ {
struct fb_var_screeninfo *var = &info->var; struct fb_var_screeninfo *var = &info->var;
struct fb_fix_screeninfo *fix = &info->fix; struct fb_fix_screeninfo *fix = &info->fix;
@ -764,8 +763,7 @@ s1d13xxxfb_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit static int s1d13xxxfb_probe(struct platform_device *pdev)
s1d13xxxfb_probe(struct platform_device *pdev)
{ {
struct s1d13xxxfb_par *default_par; struct s1d13xxxfb_par *default_par;
struct fb_info *info; struct fb_info *info;

11
drivers/video/s3c-fb.c
View File

@ -1081,8 +1081,7 @@ static void s3c_fb_missing_pixclock(struct fb_videomode *mode)
* *
* Allocate memory for the given framebuffer. * Allocate memory for the given framebuffer.
*/ */
static int __devinit s3c_fb_alloc_memory(struct s3c_fb *sfb, static int s3c_fb_alloc_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
struct s3c_fb_win *win)
{ {
struct s3c_fb_pd_win *windata = win->windata; struct s3c_fb_pd_win *windata = win->windata;
unsigned int real_size, virt_size, size; unsigned int real_size, virt_size, size;
@ -1172,7 +1171,7 @@ static void s3c_fb_release_win(struct s3c_fb *sfb, struct s3c_fb_win *win)
* Allocate and do the basic initialisation for one of the hardware's graphics * Allocate and do the basic initialisation for one of the hardware's graphics
* windows. * windows.
*/ */
static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no, static int s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
struct s3c_fb_win_variant *variant, struct s3c_fb_win_variant *variant,
struct s3c_fb_win **res) struct s3c_fb_win **res)
{ {
@ -1360,7 +1359,7 @@ static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
} }
} }
static int __devinit s3c_fb_probe(struct platform_device *pdev) static int s3c_fb_probe(struct platform_device *pdev)
{ {
const struct platform_device_id *platid; const struct platform_device_id *platid;
struct s3c_fb_driverdata *fbdrv; struct s3c_fb_driverdata *fbdrv;
@ -1521,7 +1520,7 @@ err_bus_clk:
* Shutdown and then release all the resources that the driver allocated * Shutdown and then release all the resources that the driver allocated
* on initialisation. * on initialisation.
*/ */
static int __devexit s3c_fb_remove(struct platform_device *pdev) static int s3c_fb_remove(struct platform_device *pdev)
{ {
struct s3c_fb *sfb = platform_get_drvdata(pdev); struct s3c_fb *sfb = platform_get_drvdata(pdev);
int win; int win;
@ -2035,7 +2034,7 @@ static const struct dev_pm_ops s3cfb_pm_ops = {
static struct platform_driver s3c_fb_driver = { static struct platform_driver s3c_fb_driver = {
.probe = s3c_fb_probe, .probe = s3c_fb_probe,
.remove = __devexit_p(s3c_fb_remove), .remove = s3c_fb_remove,
.id_table = s3c_fb_driver_ids, .id_table = s3c_fb_driver_ids,
.driver = { .driver = {
.name = "s3c-fb", .name = "s3c-fb",

14
drivers/video/s3c2410fb.c
View File

@ -637,7 +637,7 @@ static struct fb_ops s3c2410fb_ops = {
* cache. Once this area is remapped, all virtual memory * cache. Once this area is remapped, all virtual memory
* access to the video memory should occur at the new region. * access to the video memory should occur at the new region.
*/ */
static int __devinit s3c2410fb_map_video_memory(struct fb_info *info) static int s3c2410fb_map_video_memory(struct fb_info *info)
{ {
struct s3c2410fb_info *fbi = info->par; struct s3c2410fb_info *fbi = info->par;
dma_addr_t map_dma; dma_addr_t map_dma;
@ -819,7 +819,7 @@ static inline void s3c2410fb_cpufreq_deregister(struct s3c2410fb_info *info)
static const char driver_name[] = "s3c2410fb"; static const char driver_name[] = "s3c2410fb";
static int __devinit s3c24xxfb_probe(struct platform_device *pdev, static int s3c24xxfb_probe(struct platform_device *pdev,
enum s3c_drv_type drv_type) enum s3c_drv_type drv_type)
{ {
struct s3c2410fb_info *info; struct s3c2410fb_info *info;
@ -1010,12 +1010,12 @@ dealloc_fb:
return ret; return ret;
} }
static int __devinit s3c2410fb_probe(struct platform_device *pdev) static int s3c2410fb_probe(struct platform_device *pdev)
{ {
return s3c24xxfb_probe(pdev, DRV_S3C2410); return s3c24xxfb_probe(pdev, DRV_S3C2410);
} }
static int __devinit s3c2412fb_probe(struct platform_device *pdev) static int s3c2412fb_probe(struct platform_device *pdev)
{ {
return s3c24xxfb_probe(pdev, DRV_S3C2412); return s3c24xxfb_probe(pdev, DRV_S3C2412);
} }
@ -1024,7 +1024,7 @@ static int __devinit s3c2412fb_probe(struct platform_device *pdev)
/* /*
* Cleanup * Cleanup
*/ */
static int __devexit s3c2410fb_remove(struct platform_device *pdev) static int s3c2410fb_remove(struct platform_device *pdev)
{ {
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
struct s3c2410fb_info *info = fbinfo->par; struct s3c2410fb_info *info = fbinfo->par;
@ -1101,7 +1101,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
static struct platform_driver s3c2410fb_driver = { static struct platform_driver s3c2410fb_driver = {
.probe = s3c2410fb_probe, .probe = s3c2410fb_probe,
.remove = __devexit_p(s3c2410fb_remove), .remove = s3c2410fb_remove,
.suspend = s3c2410fb_suspend, .suspend = s3c2410fb_suspend,
.resume = s3c2410fb_resume, .resume = s3c2410fb_resume,
.driver = { .driver = {
@ -1112,7 +1112,7 @@ static struct platform_driver s3c2410fb_driver = {
static struct platform_driver s3c2412fb_driver = { static struct platform_driver s3c2412fb_driver = {
.probe = s3c2412fb_probe, .probe = s3c2412fb_probe,
.remove = __devexit_p(s3c2410fb_remove), .remove = s3c2410fb_remove,
.suspend = s3c2410fb_suspend, .suspend = s3c2410fb_suspend,
.resume = s3c2410fb_resume, .resume = s3c2410fb_resume,
.driver = { .driver = {

16
drivers/video/s3fb.c
View File

@ -153,10 +153,10 @@ static const struct svga_timing_regs s3_timing_regs = {
/* Module parameters */ /* Module parameters */
static char *mode_option __devinitdata; static char *mode_option;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static int mtrr __devinitdata = 1; static int mtrr = 1;
#endif #endif
static int fasttext = 1; static int fasttext = 1;
@ -255,7 +255,7 @@ static int s3fb_ddc_getsda(void *data)
return !!(s3fb_ddc_read(par) & DDC_SDA_IN); return !!(s3fb_ddc_read(par) & DDC_SDA_IN);
} }
static int __devinit s3fb_setup_ddc_bus(struct fb_info *info) static int s3fb_setup_ddc_bus(struct fb_info *info)
{ {
struct s3fb_info *par = info->par; struct s3fb_info *par = info->par;
@ -1066,7 +1066,7 @@ static struct fb_ops s3fb_ops = {
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static int __devinit s3_identification(struct s3fb_info *par) static int s3_identification(struct s3fb_info *par)
{ {
int chip = par->chip; int chip = par->chip;
@ -1122,7 +1122,7 @@ static int __devinit s3_identification(struct s3fb_info *par)
/* PCI probe */ /* PCI probe */
static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct pci_bus_region bus_reg; struct pci_bus_region bus_reg;
struct resource vga_res; struct resource vga_res;
@ -1403,7 +1403,7 @@ err_enable_device:
/* PCI remove */ /* PCI remove */
static void __devexit s3_pci_remove(struct pci_dev *dev) static void s3_pci_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
struct s3fb_info __maybe_unused *par = info->par; struct s3fb_info __maybe_unused *par = info->par;
@ -1509,7 +1509,7 @@ static int s3_pci_resume(struct pci_dev* dev)
/* List of boards that we are trying to support */ /* List of boards that we are trying to support */
static struct pci_device_id s3_devices[] __devinitdata = { static struct pci_device_id s3_devices[] = {
{PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8810), .driver_data = CHIP_XXX_TRIO}, {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8810), .driver_data = CHIP_XXX_TRIO},
{PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8811), .driver_data = CHIP_XXX_TRIO}, {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8811), .driver_data = CHIP_XXX_TRIO},
{PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8812), .driver_data = CHIP_M65_AURORA64VP}, {PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8812), .driver_data = CHIP_M65_AURORA64VP},
@ -1537,7 +1537,7 @@ static struct pci_driver s3fb_pci_driver = {
.name = "s3fb", .name = "s3fb",
.id_table = s3_devices, .id_table = s3_devices,
.probe = s3_pci_probe, .probe = s3_pci_probe,
.remove = __devexit_p(s3_pci_remove), .remove = s3_pci_remove,
.suspend = s3_pci_suspend, .suspend = s3_pci_suspend,
.resume = s3_pci_resume, .resume = s3_pci_resume,
}; };

8
drivers/video/sa1100fb.c
View File

@ -1090,7 +1090,7 @@ static int sa1100fb_resume(struct platform_device *dev)
* cache. Once this area is remapped, all virtual memory * cache. Once this area is remapped, all virtual memory
* access to the video memory should occur at the new region. * access to the video memory should occur at the new region.
*/ */
static int __devinit sa1100fb_map_video_memory(struct sa1100fb_info *fbi) static int sa1100fb_map_video_memory(struct sa1100fb_info *fbi)
{ {
/* /*
* We reserve one page for the palette, plus the size * 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)
} }
/* Fake monspecs to fill in fbinfo structure */ /* Fake monspecs to fill in fbinfo structure */
static struct fb_monspecs monspecs __devinitdata = { static struct fb_monspecs monspecs = {
.hfmin = 30000, .hfmin = 30000,
.hfmax = 70000, .hfmax = 70000,
.vfmin = 50, .vfmin = 50,
@ -1124,7 +1124,7 @@ static struct fb_monspecs monspecs __devinitdata = {
}; };
static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev) static struct sa1100fb_info *sa1100fb_init_fbinfo(struct device *dev)
{ {
struct sa1100fb_mach_info *inf = dev->platform_data; struct sa1100fb_mach_info *inf = dev->platform_data;
struct sa1100fb_info *fbi; struct sa1100fb_info *fbi;
@ -1205,7 +1205,7 @@ static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev)
return fbi; return fbi;
} }
static int __devinit sa1100fb_probe(struct platform_device *pdev) static int sa1100fb_probe(struct platform_device *pdev)
{ {
struct sa1100fb_info *fbi; struct sa1100fb_info *fbi;
struct resource *res; struct resource *res;

21
drivers/video/savage/savagefb_driver.c
View File

@ -69,7 +69,7 @@
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static char *mode_option __devinitdata = NULL; static char *mode_option = NULL;
#ifdef MODULE #ifdef MODULE
@ -1664,7 +1664,7 @@ static struct fb_ops savagefb_ops = {
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static struct fb_var_screeninfo __devinitdata savagefb_var800x600x8 = { static struct fb_var_screeninfo savagefb_var800x600x8 = {
.accel_flags = FB_ACCELF_TEXT, .accel_flags = FB_ACCELF_TEXT,
.xres = 800, .xres = 800,
.yres = 600, .yres = 600,
@ -1715,7 +1715,7 @@ static void savage_disable_mmio(struct savagefb_par *par)
} }
static int __devinit savage_map_mmio(struct fb_info *info) static int savage_map_mmio(struct fb_info *info)
{ {
struct savagefb_par *par = info->par; struct savagefb_par *par = info->par;
DBG("savage_map_mmio"); DBG("savage_map_mmio");
@ -1761,8 +1761,7 @@ static void savage_unmap_mmio(struct fb_info *info)
} }
} }
static int __devinit savage_map_video(struct fb_info *info, static int savage_map_video(struct fb_info *info, int video_len)
int video_len)
{ {
struct savagefb_par *par = info->par; struct savagefb_par *par = info->par;
int resource; int resource;
@ -2052,8 +2051,7 @@ static int savage_init_hw(struct savagefb_par *par)
return videoRambytes; return videoRambytes;
} }
static int __devinit savage_init_fb_info(struct fb_info *info, static int savage_init_fb_info(struct fb_info *info, struct pci_dev *dev,
struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct savagefb_par *par = info->par; struct savagefb_par *par = info->par;
@ -2178,8 +2176,7 @@ static int __devinit savage_init_fb_info(struct fb_info *info,
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static int __devinit savagefb_probe(struct pci_dev* dev, static int savagefb_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id* id)
{ {
struct fb_info *info; struct fb_info *info;
struct savagefb_par *par; struct savagefb_par *par;
@ -2340,7 +2337,7 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
return err; return err;
} }
static void __devexit savagefb_remove(struct pci_dev *dev) static void savagefb_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
@ -2449,7 +2446,7 @@ static int savagefb_resume(struct pci_dev* dev)
} }
static struct pci_device_id savagefb_devices[] __devinitdata = { static struct pci_device_id savagefb_devices[] = {
{PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX128, {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX128,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
@ -2530,7 +2527,7 @@ static struct pci_driver savagefb_driver = {
.probe = savagefb_probe, .probe = savagefb_probe,
.suspend = savagefb_suspend, .suspend = savagefb_suspend,
.resume = savagefb_resume, .resume = savagefb_resume,
.remove = __devexit_p(savagefb_remove) .remove = savagefb_remove,
}; };
/* **************************** exit-time only **************************** */ /* **************************** exit-time only **************************** */

12
drivers/video/sgivwfb.c
View File

@ -47,7 +47,7 @@ static int ywrap = 0;
static int flatpanel_id = -1; static int flatpanel_id = -1;
static struct fb_fix_screeninfo sgivwfb_fix __devinitdata = { static struct fb_fix_screeninfo sgivwfb_fix = {
.id = "SGI Vis WS FB", .id = "SGI Vis WS FB",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,
@ -57,7 +57,7 @@ static struct fb_fix_screeninfo sgivwfb_fix __devinitdata = {
.line_length = 640, .line_length = 640,
}; };
static struct fb_var_screeninfo sgivwfb_var __devinitdata = { static struct fb_var_screeninfo sgivwfb_var = {
/* 640x480, 8 bpp */ /* 640x480, 8 bpp */
.xres = 640, .xres = 640,
.yres = 480, .yres = 480,
@ -79,7 +79,7 @@ static struct fb_var_screeninfo sgivwfb_var __devinitdata = {
.vmode = FB_VMODE_NONINTERLACED .vmode = FB_VMODE_NONINTERLACED
}; };
static struct fb_var_screeninfo sgivwfb_var1600sw __devinitdata = { static struct fb_var_screeninfo sgivwfb_var1600sw = {
/* 1600x1024, 8 bpp */ /* 1600x1024, 8 bpp */
.xres = 1600, .xres = 1600,
.yres = 1024, .yres = 1024,
@ -745,7 +745,7 @@ int __init sgivwfb_setup(char *options)
/* /*
* Initialisation * Initialisation
*/ */
static int __devinit sgivwfb_probe(struct platform_device *dev) static int sgivwfb_probe(struct platform_device *dev)
{ {
struct sgivw_par *par; struct sgivw_par *par;
struct fb_info *info; struct fb_info *info;
@ -825,7 +825,7 @@ fail_ioremap_regs:
return -ENXIO; return -ENXIO;
} }
static int __devexit sgivwfb_remove(struct platform_device *dev) static int sgivwfb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
@ -845,7 +845,7 @@ static int __devexit sgivwfb_remove(struct platform_device *dev)
static struct platform_driver sgivwfb_driver = { static struct platform_driver sgivwfb_driver = {
.probe = sgivwfb_probe, .probe = sgivwfb_probe,
.remove = __devexit_p(sgivwfb_remove), .remove = sgivwfb_remove,
.driver = { .driver = {
.name = "sgivwfb", .name = "sgivwfb",
}, },

6
drivers/video/sh7760fb.c
View File

@ -431,7 +431,7 @@ static int sh7760fb_alloc_mem(struct fb_info *info)
return 0; return 0;
} }
static int __devinit sh7760fb_probe(struct platform_device *pdev) static int sh7760fb_probe(struct platform_device *pdev)
{ {
struct fb_info *info; struct fb_info *info;
struct resource *res; struct resource *res;
@ -557,7 +557,7 @@ out_fb:
return ret; return ret;
} }
static int __devexit sh7760fb_remove(struct platform_device *dev) static int sh7760fb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
struct sh7760fb_par *par = info->par; struct sh7760fb_par *par = info->par;
@ -582,7 +582,7 @@ static struct platform_driver sh7760_lcdc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = sh7760fb_probe, .probe = sh7760fb_probe,
.remove = __devexit_p(sh7760fb_remove), .remove = sh7760fb_remove,
}; };
module_platform_driver(sh7760_lcdc_driver); module_platform_driver(sh7760_lcdc_driver);

4
drivers/video/sh_mipi_dsi.c
View File

@ -533,7 +533,7 @@ efindslot:
return ret; return ret;
} }
static int __devexit sh_mipi_remove(struct platform_device *pdev) static int sh_mipi_remove(struct platform_device *pdev)
{ {
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1); struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@ -574,7 +574,7 @@ static int __devexit sh_mipi_remove(struct platform_device *pdev)
} }
static struct platform_driver sh_mipi_driver = { static struct platform_driver sh_mipi_driver = {
.remove = __devexit_p(sh_mipi_remove), .remove = sh_mipi_remove,
.shutdown = sh_mipi_shutdown, .shutdown = sh_mipi_shutdown,
.driver = { .driver = {
.name = "sh-mipi-dsi", .name = "sh-mipi-dsi",

18
drivers/video/sh_mobile_lcdcfb.c
View File

@ -1649,7 +1649,7 @@ sh_mobile_lcdc_overlay_fb_unregister(struct sh_mobile_lcdc_overlay *ovl)
unregister_framebuffer(ovl->info); unregister_framebuffer(ovl->info);
} }
static int __devinit static int
sh_mobile_lcdc_overlay_fb_register(struct sh_mobile_lcdc_overlay *ovl) sh_mobile_lcdc_overlay_fb_register(struct sh_mobile_lcdc_overlay *ovl)
{ {
struct sh_mobile_lcdc_priv *lcdc = ovl->channel->lcdc; 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)
framebuffer_release(info); framebuffer_release(info);
} }
static int __devinit static int
sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl) sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl)
{ {
struct sh_mobile_lcdc_priv *priv = ovl->channel->lcdc; 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)
unregister_framebuffer(ch->info); unregister_framebuffer(ch->info);
} }
static int __devinit static int
sh_mobile_lcdc_channel_fb_register(struct sh_mobile_lcdc_chan *ch) sh_mobile_lcdc_channel_fb_register(struct sh_mobile_lcdc_chan *ch)
{ {
struct fb_info *info = ch->info; struct fb_info *info = ch->info;
@ -2185,7 +2185,7 @@ sh_mobile_lcdc_channel_fb_cleanup(struct sh_mobile_lcdc_chan *ch)
framebuffer_release(info); framebuffer_release(info);
} }
static int __devinit static int
sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch, sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch,
const struct fb_videomode *modes, const struct fb_videomode *modes,
unsigned int num_modes) unsigned int num_modes)
@ -2417,7 +2417,7 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb,
* Probe/remove and driver init/exit * Probe/remove and driver init/exit
*/ */
static const struct fb_videomode default_720p __devinitconst = { static const struct fb_videomode default_720p = {
.name = "HDMI 720p", .name = "HDMI 720p",
.xres = 1280, .xres = 1280,
.yres = 720, .yres = 720,
@ -2496,7 +2496,7 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch) static int sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *ch)
{ {
int interface_type = ch->cfg->interface_type; int interface_type = ch->cfg->interface_type;
@ -2536,7 +2536,7 @@ static int __devinit sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan *
return 0; return 0;
} }
static int __devinit static int
sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_overlay *ovl) sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_overlay *ovl)
{ {
const struct sh_mobile_lcdc_format_info *format; const struct sh_mobile_lcdc_format_info *format;
@ -2591,7 +2591,7 @@ sh_mobile_lcdc_overlay_init(struct sh_mobile_lcdc_overlay *ovl)
return 0; return 0;
} }
static int __devinit static int
sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch) sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch)
{ {
const struct sh_mobile_lcdc_format_info *format; const struct sh_mobile_lcdc_format_info *format;
@ -2695,7 +2695,7 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch)
return sh_mobile_lcdc_channel_fb_init(ch, mode, num_modes); return sh_mobile_lcdc_channel_fb_init(ch, mode, num_modes);
} }
static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) static int sh_mobile_lcdc_probe(struct platform_device *pdev)
{ {
struct sh_mobile_lcdc_info *pdata = pdev->dev.platform_data; struct sh_mobile_lcdc_info *pdata = pdev->dev.platform_data;
struct sh_mobile_lcdc_priv *priv; struct sh_mobile_lcdc_priv *priv;

Some files were not shown because too many files have changed in this diff Show More