Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 799b88de authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBhumika 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: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent aa55457d

drivers/video/fbdev/68328fb.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static struct fb_var_screeninfo mc68x328fb_default __initdata = { 
      	.vmode =	FB_VMODE_NONINTERLACED,

};



static struct fb_fix_screeninfo mc68x328fb_fix __initdata = {

static const struct fb_fix_screeninfo mc68x328fb_fix __initconst = {

	.id =		"68328fb",

	.type =		FB_TYPE_PACKED_PIXELS,

	.xpanstep =	1,

drivers/video/fbdev/atmel_lcdfb.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	.visual		= FB_VISUAL_TRUECOLOR,

	.xpanstep	= 0,

drivers/video/fbdev/dnfb.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct fb_var_screeninfo dnfb_var = { 
	.vmode		= FB_VMODE_NONINTERLACED,

};



static struct fb_fix_screeninfo dnfb_fix = {

static const struct fb_fix_screeninfo dnfb_fix = {

	.id		= "Apollo Mono",

	.smem_start	= (FRAME_BUFFER_START + IO_BASE),

	.smem_len	= FRAME_BUFFER_LEN,

drivers/video/fbdev/grvga.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

	.type =		FB_TYPE_PACKED_PIXELS,

	.visual =       FB_VISUAL_PSEUDOCOLOR,

drivers/video/fbdev/pmag-aa-fb.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static struct fb_var_screeninfo aafb_defined = { 
	.vmode		= FB_VMODE_NONINTERLACED,

};



static struct fb_fix_screeninfo aafb_fix = {

static const struct fb_fix_screeninfo aafb_fix = {

	.id		= "PMAG-AA",

	.smem_len	= (2048 * 1024),

	.type		= FB_TYPE_PACKED_PIXELS,