video: fbdev: constify fb_fix_screeninfo and fb_var_screeninfo structures
These structures are only used to copy into other structures, so declare them as const. The semantic patch that makes this change in the fb_fix_screeninfo case is as follows (http://coccinelle.lip6.fr/). The fb_var_screeninfo case is analogous. // <smpl> @r disable optional_qualifier@ identifier i; position p; @@ static struct fb_fix_screeninfo i@p = { ... }; @ok@ identifier r.i; expression e; position p; @@ e = i@p @bad@ position p != {r.p,ok.p}; identifier r.i; struct fb_fix_screeninfo e; @@ e@i@p @depends on !bad disable optional_qualifier@ identifier r.i; @@ static +const struct fb_fix_screeninfo i = { ... }; // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Родитель
1d2ffbd3e0
Коммит
ca9384c591
|
@ -79,7 +79,7 @@ struct arcfb_par {
|
||||||
spinlock_t lock;
|
spinlock_t lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_fix_screeninfo arcfb_fix = {
|
static const 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 = {
|
||||||
.accel = FB_ACCEL_NONE,
|
.accel = FB_ACCEL_NONE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo arcfb_var = {
|
static const struct fb_var_screeninfo arcfb_var = {
|
||||||
.xres = 128,
|
.xres = 128,
|
||||||
.yres = 64,
|
.yres = 64,
|
||||||
.xres_virtual = 128,
|
.xres_virtual = 128,
|
||||||
|
|
|
@ -474,7 +474,7 @@ static void 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 = {
|
static const 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 = {
|
||||||
.smem_len = 0x200000, /* 2MB */
|
.smem_len = 0x200000, /* 2MB */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo asiliantfb_var = {
|
static const struct fb_var_screeninfo asiliantfb_var = {
|
||||||
.xres = 640,
|
.xres = 640,
|
||||||
.yres = 480,
|
.yres = 480,
|
||||||
.xres_virtual = 640,
|
.xres_virtual = 640,
|
||||||
|
|
|
@ -93,7 +93,7 @@
|
||||||
|
|
||||||
#ifndef CONFIG_PPC_PMAC
|
#ifndef CONFIG_PPC_PMAC
|
||||||
/* default mode */
|
/* default mode */
|
||||||
static struct fb_var_screeninfo default_var = {
|
static const 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},
|
||||||
|
@ -104,7 +104,7 @@ static struct fb_var_screeninfo default_var = {
|
||||||
#else /* CONFIG_PPC_PMAC */
|
#else /* CONFIG_PPC_PMAC */
|
||||||
/* default to 1024x768 at 75Hz on PPC - this will work
|
/* default to 1024x768 at 75Hz on PPC - this will work
|
||||||
* on the iMac, the usual 640x480 @ 60Hz doesn't. */
|
* on the iMac, the usual 640x480 @ 60Hz doesn't. */
|
||||||
static struct fb_var_screeninfo default_var = {
|
static const struct fb_var_screeninfo default_var = {
|
||||||
/* 1024x768, 75 Hz, Non-Interlaced (78.75 MHz dotclock) */
|
/* 1024x768, 75 Hz, Non-Interlaced (78.75 MHz dotclock) */
|
||||||
1024, 768, 1024, 768, 0, 0, 8, 0,
|
1024, 768, 1024, 768, 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},
|
||||||
|
@ -375,7 +375,7 @@ static const struct aty128_meminfo ddr_sgram = {
|
||||||
.name = "64-bit DDR SGRAM",
|
.name = "64-bit DDR SGRAM",
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_fix_screeninfo aty128fb_fix = {
|
static const 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,
|
||||||
|
|
|
@ -212,7 +212,7 @@ struct pci_mmap_map {
|
||||||
unsigned long prot_mask;
|
unsigned long prot_mask;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_fix_screeninfo atyfb_fix = {
|
static const 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,
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "../edid.h"
|
#include "../edid.h"
|
||||||
|
|
||||||
static struct fb_var_screeninfo radeonfb_default_var = {
|
static const struct fb_var_screeninfo radeonfb_default_var = {
|
||||||
.xres = 640,
|
.xres = 640,
|
||||||
.yres = 480,
|
.yres = 480,
|
||||||
.xres_virtual = 640,
|
.xres_virtual = 640,
|
||||||
|
|
|
@ -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 = {
|
static const 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 = {
|
||||||
.accel = FB_ACCEL_NONE,
|
.accel = FB_ACCEL_NONE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo hecubafb_var = {
|
static const 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,
|
||||||
|
|
|
@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(hga_reg_lock);
|
||||||
|
|
||||||
/* Framebuffer driver structures */
|
/* Framebuffer driver structures */
|
||||||
|
|
||||||
static struct fb_var_screeninfo hga_default_var = {
|
static const struct fb_var_screeninfo hga_default_var = {
|
||||||
.xres = 720,
|
.xres = 720,
|
||||||
.yres = 348,
|
.yres = 348,
|
||||||
.xres_virtual = 720,
|
.xres_virtual = 720,
|
||||||
|
|
|
@ -82,7 +82,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 = {
|
static const 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,
|
||||||
|
|
|
@ -44,7 +44,7 @@ static struct fb_fix_screeninfo kyro_fix = {
|
||||||
.accel = FB_ACCEL_NONE,
|
.accel = FB_ACCEL_NONE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo kyro_var = {
|
static const struct fb_var_screeninfo kyro_var = {
|
||||||
/* 640x480, 16bpp @ 60 Hz */
|
/* 640x480, 16bpp @ 60 Hz */
|
||||||
.xres = 640,
|
.xres = 640,
|
||||||
.yres = 480,
|
.yres = 480,
|
||||||
|
|
|
@ -113,7 +113,7 @@ static struct fb_fix_screeninfo pm2fb_fix = {
|
||||||
/*
|
/*
|
||||||
* 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 = {
|
static const struct fb_var_screeninfo pm2fb_var = {
|
||||||
/* "640x480, 8 bpp @ 60 Hz */
|
/* "640x480, 8 bpp @ 60 Hz */
|
||||||
.xres = 640,
|
.xres = 640,
|
||||||
.yres = 480,
|
.yres = 480,
|
||||||
|
|
|
@ -83,7 +83,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 s1d13xxxfb_fix = {
|
static const 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,
|
||||||
|
|
|
@ -1660,7 +1660,7 @@ static struct fb_ops savagefb_ops = {
|
||||||
|
|
||||||
/* --------------------------------------------------------------------- */
|
/* --------------------------------------------------------------------- */
|
||||||
|
|
||||||
static struct fb_var_screeninfo savagefb_var800x600x8 = {
|
static const struct fb_var_screeninfo savagefb_var800x600x8 = {
|
||||||
.accel_flags = FB_ACCELF_TEXT,
|
.accel_flags = FB_ACCELF_TEXT,
|
||||||
.xres = 800,
|
.xres = 800,
|
||||||
.yres = 600,
|
.yres = 600,
|
||||||
|
|
|
@ -33,14 +33,14 @@
|
||||||
#include <linux/parser.h>
|
#include <linux/parser.h>
|
||||||
#include <linux/regulator/consumer.h>
|
#include <linux/regulator/consumer.h>
|
||||||
|
|
||||||
static struct fb_fix_screeninfo simplefb_fix = {
|
static const struct fb_fix_screeninfo simplefb_fix = {
|
||||||
.id = "simple",
|
.id = "simple",
|
||||||
.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 simplefb_var = {
|
static const struct fb_var_screeninfo simplefb_var = {
|
||||||
.height = -1,
|
.height = -1,
|
||||||
.width = -1,
|
.width = -1,
|
||||||
.activate = FB_ACTIVATE_NOW,
|
.activate = FB_ACTIVATE_NOW,
|
||||||
|
|
|
@ -56,7 +56,7 @@ struct smtcfb_info {
|
||||||
|
|
||||||
void __iomem *smtc_regbaseaddress; /* Memory Map IO starting address */
|
void __iomem *smtc_regbaseaddress; /* Memory Map IO starting address */
|
||||||
|
|
||||||
static struct fb_var_screeninfo smtcfb_var = {
|
static const struct fb_var_screeninfo smtcfb_var = {
|
||||||
.xres = 1024,
|
.xres = 1024,
|
||||||
.yres = 600,
|
.yres = 600,
|
||||||
.xres_virtual = 1024,
|
.xres_virtual = 1024,
|
||||||
|
|
|
@ -84,7 +84,7 @@ struct ssd1307fb_array {
|
||||||
u8 data[0];
|
u8 data[0];
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_fix_screeninfo ssd1307fb_fix = {
|
static const struct fb_fix_screeninfo ssd1307fb_fix = {
|
||||||
.id = "Solomon SSD1307",
|
.id = "Solomon SSD1307",
|
||||||
.type = FB_TYPE_PACKED_PIXELS,
|
.type = FB_TYPE_PACKED_PIXELS,
|
||||||
.visual = FB_VISUAL_MONO10,
|
.visual = FB_VISUAL_MONO10,
|
||||||
|
@ -94,7 +94,7 @@ static struct fb_fix_screeninfo ssd1307fb_fix = {
|
||||||
.accel = FB_ACCEL_NONE,
|
.accel = FB_ACCEL_NONE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo ssd1307fb_var = {
|
static const struct fb_var_screeninfo ssd1307fb_var = {
|
||||||
.bits_per_pixel = 1,
|
.bits_per_pixel = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
#define VOODOO3_MAX_PIXCLOCK 300000
|
#define VOODOO3_MAX_PIXCLOCK 300000
|
||||||
#define VOODOO5_MAX_PIXCLOCK 350000
|
#define VOODOO5_MAX_PIXCLOCK 350000
|
||||||
|
|
||||||
static struct fb_fix_screeninfo tdfx_fix = {
|
static const struct fb_fix_screeninfo tdfx_fix = {
|
||||||
.type = FB_TYPE_PACKED_PIXELS,
|
.type = FB_TYPE_PACKED_PIXELS,
|
||||||
.visual = FB_VISUAL_PSEUDOCOLOR,
|
.visual = FB_VISUAL_PSEUDOCOLOR,
|
||||||
.ypanstep = 1,
|
.ypanstep = 1,
|
||||||
|
@ -90,7 +90,7 @@ static struct fb_fix_screeninfo tdfx_fix = {
|
||||||
.accel = FB_ACCEL_3DFX_BANSHEE
|
.accel = FB_ACCEL_3DFX_BANSHEE
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo tdfx_var = {
|
static const struct fb_var_screeninfo tdfx_var = {
|
||||||
/* "640x480, 8 bpp @ 60 Hz */
|
/* "640x480, 8 bpp @ 60 Hz */
|
||||||
.xres = 640,
|
.xres = 640,
|
||||||
.yres = 480,
|
.yres = 480,
|
||||||
|
|
|
@ -33,7 +33,7 @@ static struct cb_id uvesafb_cn_id = {
|
||||||
static char v86d_path[PATH_MAX] = "/sbin/v86d";
|
static char v86d_path[PATH_MAX] = "/sbin/v86d";
|
||||||
static char v86d_started; /* has v86d been started by uvesafb? */
|
static char v86d_started; /* has v86d been started by uvesafb? */
|
||||||
|
|
||||||
static struct fb_fix_screeninfo uvesafb_fix = {
|
static const struct fb_fix_screeninfo uvesafb_fix = {
|
||||||
.id = "VESA VGA",
|
.id = "VESA VGA",
|
||||||
.type = FB_TYPE_PACKED_PIXELS,
|
.type = FB_TYPE_PACKED_PIXELS,
|
||||||
.accel = FB_ACCEL_NONE,
|
.accel = FB_ACCEL_NONE,
|
||||||
|
|
|
@ -85,7 +85,7 @@ static struct fb_var_screeninfo vga16fb_defined = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* name should not depend on EGA/VGA */
|
/* name should not depend on EGA/VGA */
|
||||||
static struct fb_fix_screeninfo vga16fb_fix = {
|
static const struct fb_fix_screeninfo vga16fb_fix = {
|
||||||
.id = "VGA16 VGA",
|
.id = "VGA16 VGA",
|
||||||
.smem_start = VGA_FB_PHYS,
|
.smem_start = VGA_FB_PHYS,
|
||||||
.smem_len = VGA_FB_PHYS_LEN,
|
.smem_len = VGA_FB_PHYS_LEN,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче