From 0a859b31ec9c8bce9aacc9ccae3af6aab84b04c7 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 22 Feb 2017 21:54:56 -0800 Subject: staging: fbtft: Make the pointers to s16 init arrays const This allows making some of the actual arrays const. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman --- drivers/staging/fbtft/fbtft-core.c | 2 +- drivers/staging/fbtft/fbtft.h | 4 ++-- drivers/staging/fbtft/flexfb.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/staging/fbtft') diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index f548513..b891834 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -658,7 +658,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, unsigned int bpp = display->bpp; unsigned int fps = display->fps; int vmem_size, i; - s16 *init_sequence = display->init_sequence; + const s16 *init_sequence = display->init_sequence; char *gamma = display->gamma; u32 *gamma_curves = NULL; diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 44cf94d..119c3a7 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -124,7 +124,7 @@ struct fbtft_display { unsigned int bpp; unsigned int fps; int txbuflen; - s16 *init_sequence; + const s16 *init_sequence; char *gamma; int gamma_num; int gamma_len; @@ -228,7 +228,7 @@ struct fbtft_par { int led[16]; int aux[16]; } gpio; - s16 *init_sequence; + const s16 *init_sequence; struct { struct mutex lock; u32 *curves; diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c index af8422e..f749c05 100644 --- a/drivers/staging/fbtft/flexfb.c +++ b/drivers/staging/fbtft/flexfb.c @@ -63,7 +63,7 @@ static bool latched; module_param(latched, bool, 0000); MODULE_PARM_DESC(latched, "Use with latched 16-bit databus"); -static s16 *initp; +static const s16 *initp; static int initp_num; /* default init sequences */ @@ -390,7 +390,7 @@ struct flexfb_lcd_controller { unsigned int height; unsigned int setaddrwin; unsigned int regwidth; - s16 *init_seq; + const s16 *init_seq; int init_seq_sz; }; -- cgit v1.1