Commit d95159cf authored by Helge Deller's avatar Helge Deller Committed by Linus Torvalds

[PATCH] various fbdev files: mark structs and array read-only

- move some structs and arrays to the read-only (.rodata) section

[akpm@osdl.org: build fix]
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Acked-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent adf6b206
...@@ -142,7 +142,7 @@ static struct class backlight_class = { ...@@ -142,7 +142,7 @@ static struct class backlight_class = {
.store = _store, \ .store = _store, \
} }
static struct class_device_attribute bl_class_device_attributes[] = { static const struct class_device_attribute bl_class_device_attributes[] = {
DECLARE_ATTR(power, 0644, backlight_show_power, backlight_store_power), DECLARE_ATTR(power, 0644, backlight_show_power, backlight_store_power),
DECLARE_ATTR(brightness, 0644, backlight_show_brightness, DECLARE_ATTR(brightness, 0644, backlight_show_brightness,
backlight_store_brightness), backlight_store_brightness),
......
...@@ -121,7 +121,7 @@ static struct class lcd_class = { ...@@ -121,7 +121,7 @@ static struct class lcd_class = {
.store = _store, \ .store = _store, \
} }
static struct class_device_attribute lcd_class_device_attributes[] = { static const struct class_device_attribute lcd_class_device_attributes[] = {
DECLARE_ATTR(power, 0644, lcd_show_power, lcd_store_power), DECLARE_ATTR(power, 0644, lcd_show_power, lcd_store_power),
DECLARE_ATTR(contrast, 0644, lcd_show_contrast, lcd_store_contrast), DECLARE_ATTR(contrast, 0644, lcd_show_contrast, lcd_store_contrast),
DECLARE_ATTR(max_contrast, 0444, lcd_show_max_contrast, NULL), DECLARE_ATTR(max_contrast, 0444, lcd_show_max_contrast, NULL),
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
static u32 cfb_tab8[] = { static const u32 cfb_tab8[] = {
#if defined(__BIG_ENDIAN) #if defined(__BIG_ENDIAN)
0x00000000,0x000000ff,0x0000ff00,0x0000ffff, 0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff, 0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
...@@ -58,7 +58,7 @@ static u32 cfb_tab8[] = { ...@@ -58,7 +58,7 @@ static u32 cfb_tab8[] = {
#endif #endif
}; };
static u32 cfb_tab16[] = { static const u32 cfb_tab16[] = {
#if defined(__BIG_ENDIAN) #if defined(__BIG_ENDIAN)
0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff 0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
#elif defined(__LITTLE_ENDIAN) #elif defined(__LITTLE_ENDIAN)
...@@ -68,7 +68,7 @@ static u32 cfb_tab16[] = { ...@@ -68,7 +68,7 @@ static u32 cfb_tab16[] = {
#endif #endif
}; };
static u32 cfb_tab32[] = { static const u32 cfb_tab32[] = {
0x00000000, 0xffffffff 0x00000000, 0xffffffff
}; };
...@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * ...@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *
u32 bit_mask, end_mask, eorx, shift; u32 bit_mask, end_mask, eorx, shift;
const char *s = image->data, *src; const char *s = image->data, *src;
u32 __iomem *dst; u32 __iomem *dst;
u32 *tab = NULL; const u32 *tab = NULL;
int i, j, k; int i, j, k;
switch (bpp) { switch (bpp) {
......
...@@ -345,7 +345,7 @@ static void sticon_save_screen(struct vc_data *conp) ...@@ -345,7 +345,7 @@ static void sticon_save_screen(struct vc_data *conp)
{ {
} }
static struct consw sti_con = { static const struct consw sti_con = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.con_startup = sticon_startup, .con_startup = sticon_startup,
.con_init = sticon_init, .con_init = sticon_init,
......
...@@ -57,7 +57,7 @@ struct fb_cvt_data { ...@@ -57,7 +57,7 @@ struct fb_cvt_data {
u32 status; u32 status;
}; };
static int fb_cvt_vbi_tab[] = { static const unsigned char fb_cvt_vbi_tab[] = {
4, /* 4:3 */ 4, /* 4:3 */
5, /* 16:9 */ 5, /* 16:9 */
6, /* 16:10 */ 6, /* 16:10 */
......
...@@ -58,7 +58,7 @@ struct broken_edid { ...@@ -58,7 +58,7 @@ struct broken_edid {
u32 fix; u32 fix;
}; };
static struct broken_edid brokendb[] = { static const struct broken_edid brokendb[] = {
/* DEC FR-PCXAV-YZ */ /* DEC FR-PCXAV-YZ */
{ {
.manufacturer = "DEC", .manufacturer = "DEC",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment