From: Russell King Date: Sat, 14 Jan 2012 10:13:30 +0000 (+0000) Subject: FB: sa1100: constify rgb structures X-Git-Tag: v3.4-rc1~83^2^3~5^2~11 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f5cbf275f8fb9529cba20df2564d370a6107da;p=pandora-kernel.git FB: sa1100: constify rgb structures The rgb structures should only be read and never written. Constify them. Acked-by: Florian Tobias Schandinat Signed-off-by: Russell King --- diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index bac9d4f39da5..a797220fdf5c 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -199,21 +199,21 @@ extern void (*sa1100fb_backlight_power)(int on); extern void (*sa1100fb_lcd_power)(int on); -static struct sa1100fb_rgb rgb_4 = { +static const struct sa1100fb_rgb rgb_4 = { .red = { .offset = 0, .length = 4, }, .green = { .offset = 0, .length = 4, }, .blue = { .offset = 0, .length = 4, }, .transp = { .offset = 0, .length = 0, }, }; -static struct sa1100fb_rgb rgb_8 = { +static const struct sa1100fb_rgb rgb_8 = { .red = { .offset = 0, .length = 8, }, .green = { .offset = 0, .length = 8, }, .blue = { .offset = 0, .length = 8, }, .transp = { .offset = 0, .length = 0, }, }; -static struct sa1100fb_rgb def_rgb_16 = { +static const struct sa1100fb_rgb def_rgb_16 = { .red = { .offset = 11, .length = 5, }, .green = { .offset = 5, .length = 6, }, .blue = { .offset = 0, .length = 5, }, @@ -270,7 +270,7 @@ static struct sa1100fb_mach_info h3600_info __devinitdata = { .lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2), }; -static struct sa1100fb_rgb h3600_rgb_16 = { +static const struct sa1100fb_rgb h3600_rgb_16 = { .red = { .offset = 12, .length = 4, }, .green = { .offset = 7, .length = 4, }, .blue = { .offset = 1, .length = 4, }, diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h index 1c3b459865d8..7a3d66a5516f 100644 --- a/drivers/video/sa1100fb.h +++ b/drivers/video/sa1100fb.h @@ -65,7 +65,7 @@ struct sa1100fb_lcd_reg { struct sa1100fb_info { struct fb_info fb; struct device *dev; - struct sa1100fb_rgb *rgb[NR_RGB]; + const struct sa1100fb_rgb *rgb[NR_RGB]; u_int max_bpp; u_int max_xres;