UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

video: fbdev: annotate fb_fix_screeninfo with const and __initconst 

Make these const as they are only used during a copy operation.
Some structures are used as a copy operation inside __init functions, so
make them const and replace __initdata with __initconst to avoid section
conflict error.

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Bhumika Goyal 2017-09-04 16:00:49 +02:00 committed by Bartlomiej Zolnierkiewicz
parent aa55457d26
commit 799b88deec
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/fbdev/68328fb.c
View File

@ -72,7 +72,7 @@ static struct fb_var_screeninfo mc68x328fb_default __initdata = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo mc68x328fb_fix __initdata = { static const struct fb_fix_screeninfo mc68x328fb_fix __initconst = {
.id = "68328fb", .id = "68328fb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.xpanstep = 1, .xpanstep = 1,

2
drivers/video/fbdev/atmel_lcdfb.c
View File

@ -320,7 +320,7 @@ static inline void atmel_lcdfb_power_control(struct atmel_lcdfb_info *sinfo, int
} }
} }
static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = { static const struct fb_fix_screeninfo atmel_lcdfb_fix __initconst = {
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,
.xpanstep = 0, .xpanstep = 0,

2
drivers/video/fbdev/dnfb.c
View File

@ -126,7 +126,7 @@ struct fb_var_screeninfo dnfb_var = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo dnfb_fix = { static const 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,

2
drivers/video/fbdev/grvga.c
View File

@ -70,7 +70,7 @@ static const struct fb_videomode grvga_modedb[] = {
} }
}; };
static struct fb_fix_screeninfo grvga_fix = { static const 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,

2
drivers/video/fbdev/pmag-aa-fb.c
View File

@ -90,7 +90,7 @@ static struct fb_var_screeninfo aafb_defined = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo aafb_fix = { static const struct fb_fix_screeninfo aafb_fix = {
.id = "PMAG-AA", .id = "PMAG-AA",
.smem_len = (2048 * 1024), .smem_len = (2048 * 1024),
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,

2
drivers/video/fbdev/pmag-ba-fb.c
View File

@ -67,7 +67,7 @@ static struct fb_var_screeninfo pmagbafb_defined = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo pmagbafb_fix = { static const 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,

2
drivers/video/fbdev/pmagb-b-fb.c
View File

@ -57,7 +57,7 @@ static struct fb_var_screeninfo pmagbbfb_defined = {
.vmode = FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo pmagbbfb_fix = { static const 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,

2
drivers/video/fbdev/ps3fb.c
View File

@ -952,7 +952,7 @@ static struct fb_ops ps3fb_ops = {
.fb_compat_ioctl = ps3fb_ioctl .fb_compat_ioctl = ps3fb_ioctl
}; };
static struct fb_fix_screeninfo ps3fb_fix = { static const struct fb_fix_screeninfo ps3fb_fix = {
.id = DEVICE_NAME, .id = DEVICE_NAME,
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,

2
drivers/video/fbdev/skeletonfb.c
View File

@ -84,7 +84,7 @@ struct xxx_par;
* if we don't use modedb. If we do use modedb see xxxfb_init how to use it * if we don't use modedb. If we do use modedb see xxxfb_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 xxxfb_fix = { static const struct fb_fix_screeninfo xxxfb_fix = {
.id = "FB's name", .id = "FB's name",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,