staging: fbtft: Make s16 arrays const
Subsystems (2)
cover staging: fbtft: Make s16 arrays const
Joe Perches (2):
staging: fbtft: Make the pointers to s16 init arrays const
staging: fbtft: Make some s16 arrays const
drivers/staging/fbtft/fb_ili9481.c | 2 +- drivers/staging/fbtft/fb_ili9486.c | 2 +- drivers/staging/fbtft/fb_s6d02a1.c | 2 +- drivers/staging/fbtft/fb_st7735r.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 2 +- drivers/staging/fbtft/fbtft.h | 4 ++-- drivers/staging/fbtft/fbtft_device.c | 8 ++++---- drivers/staging/fbtft/flexfb.c | 20 ++++++++++---------- 8 files changed, 21 insertions(+), 21 deletions(-)
Signature · 1 line
2.10.0.rc2.1.g053435c
PATCH 1/2 staging: fbtft: Make the pointers to s16 init arrays const
This allows making some of the actual arrays const.
Signed-off-by Joe Perches <[email protected]>
--- 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(-)
drivers/staging/fbtft/fbtft-core.c +1 -1
@@ -659,7 +659,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 ;
drivers/staging/fbtft/fbtft.h +2 -2
@@ -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;
drivers/staging/fbtft/flexfb.c +2 -2
@@ -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; };
Signature · 1 line
2.10.0.rc2.1.g053435c
PATCH 2/2 staging: fbtft: Make some s16 arrays const
In reply to Joe PerchesUsing const reduces data size.
$ size drivers/staging/fbtft/built-in.o* text data bss dec hex filename 89909 41584 2928 134421 20d15 drivers/staging/fbtft/built-in.o.new 88053 43392 2928 134373 20ce5 drivers/staging/fbtft/built-in.o.old
Signed-off-by Joe Perches <[email protected]>
--- drivers/staging/fbtft/fb_ili9481.c | 2 +- drivers/staging/fbtft/fb_ili9486.c | 2 +- drivers/staging/fbtft/fb_s6d02a1.c | 2 +- drivers/staging/fbtft/fb_st7735r.c | 2 +- drivers/staging/fbtft/fbtft_device.c | 8 ++++---- drivers/staging/fbtft/flexfb.c | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/staging/fbtft/fb_ili9481.c +1 -1
@@ -27,7 +27,7 @@#define WIDTH 320#define HEIGHT 480 -static s16 default_init_sequence[] = { +static const s16 default_init_sequence[] = {/* SLP_OUT - Sleep out */ -1 ,MIPI_DCS_EXIT_SLEEP_MODE ,-2 ,50 ,
drivers/staging/fbtft/fb_ili9486.c +1 -1
@@ -26,7 +26,7 @@#define HEIGHT 480/* this init sequence matches PiScreen */ -static s16 default_init_sequence[] = { +static const s16 default_init_sequence[] = {/* Interface Mode Control */ -1 ,0xb0 ,0x0 ,-1 ,MIPI_DCS_EXIT_SLEEP_MODE ,
drivers/staging/fbtft/fb_s6d02a1.c +1 -1
@@ -24,7 +24,7 @@#define DRVNAME "fb_s6d02a1" -static s16 default_init_sequence[] = { +static const s16 default_init_sequence[] = {-1 ,0xf0 ,0x5a ,0x5a ,
drivers/staging/fbtft/fb_st7735r.c +1 -1
@@ -25,7 +25,7 @@#define DEFAULT_GAMMA "0F 1A 0F 18 2F 28 20 22 1F 1B 23 37 00 07 02 10\n" \ "0F 1B 0F 17 33 2C 29 2E 30 30 39 3F 00 07 03 10" -static s16 default_init_sequence[] = { +static const s16 default_init_sequence[] = {-1 ,MIPI_DCS_SOFT_RESET ,-2 ,150 ,/* delay */
drivers/staging/fbtft/fbtft_device.c +4 -4
@@ -131,7 +131,7 @@ static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par,"D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\n" \"D0 00 14 15 13 0B 43 55 53 0C 17 14 23 20" -static s16 cberry28_init_sequence[] = { +static const s16 cberry28_init_sequence[] = {/* turn off sleep mode */ -1 ,MIPI_DCS_EXIT_SLEEP_MODE , -2, 120,
@@ -180,7 +180,7 @@ static s16 cberry28_init_sequence[] = { -3, }; -static s16 hy28b_init_sequence[] = { +static const s16 hy28b_init_sequence[] = {-1 ,0x00e7 ,0x0010 ,-1 ,0x0000 ,0x0001 ,-1 ,0x0001 ,0x0100 ,-1 ,0x0002 ,0x0700 ,-1 ,0x0003 ,0x1030 ,-1 ,0x0004 ,0x0000 ,
@@ -211,7 +211,7 @@ static s16 hy28b_init_sequence[] = {"04 1F 4 7 7 0 7 7 6 0\n" \"0F 00 1 7 4 0 0 0 6 7" -static s16 pitft_init_sequence[] = { +static const s16 pitft_init_sequence[] = {-1 ,MIPI_DCS_SOFT_RESET ,-2 ,5 , -1, MIPI_DCS_SET_DISPLAY_OFF,
@@ -242,7 +242,7 @@ static s16 pitft_init_sequence[] = {-3 }; -static s16 waveshare32b_init_sequence[] = { +static const s16 waveshare32b_init_sequence[] = {-1 ,0xCB ,0x39 ,0x2C ,0x00 ,0x34 ,0x02 ,-1 ,0xCF ,0x00 ,0xC1 ,0x30 ,-1 ,0xE8 ,0x85 ,0x00 ,0x78 ,
drivers/staging/fbtft/flexfb.c +8 -8
@@ -67,7 +67,7 @@ static const s16 *initp;static int initp_num;/* default init sequences */ -static s16 st7735r_init[] = { +static const s16 st7735r_init[] = {-1 ,0x01 ,-2 ,150 ,-1 ,0x11 ,
@@ -96,7 +96,7 @@ static s16 st7735r_init[] = {-3 }; -static s16 ssd1289_init[] = { +static const s16 ssd1289_init[] = {-1 ,0x00 ,0x0001 ,-1 ,0x03 ,0xA8A4 ,-1 ,0x0C ,0x0000 ,
@@ -142,7 +142,7 @@ static s16 ssd1289_init[] = {-3 }; -static s16 hx8340bn_init[] = { +static const s16 hx8340bn_init[] = {-1 ,0xC1 ,0xFF ,0x83 ,0x40 ,-1 ,0x11 ,-2 ,150 ,
@@ -162,7 +162,7 @@ static s16 hx8340bn_init[] = {-3 }; -static s16 ili9225_init[] = { +static const s16 ili9225_init[] = {-1 ,0x0001 ,0x011C ,-1 ,0x0002 ,0x0100 ,-1 ,0x0003 ,0x1030 ,
@@ -204,7 +204,7 @@ static s16 ili9225_init[] = {-3 }; -static s16 ili9320_init[] = { +static const s16 ili9320_init[] = {-1 ,0x00E5 ,0x8000 ,-1 ,0x0000 ,0x0001 ,-1 ,0x0001 ,0x0100 ,
@@ -265,7 +265,7 @@ static s16 ili9320_init[] = {-3 }; -static s16 ili9325_init[] = { +static const s16 ili9325_init[] = {-1 ,0x00E3 ,0x3008 ,-1 ,0x00E7 ,0x0012 ,-1 ,0x00EF ,0x1231 ,
@@ -324,7 +324,7 @@ static s16 ili9325_init[] = {-3 }; -static s16 ili9341_init[] = { +static const s16 ili9341_init[] = {-1 ,0x28 ,-2 ,20 ,-1 ,0xCF ,0x00 ,0x83 ,0x30 ,
@@ -349,7 +349,7 @@ static s16 ili9341_init[] = {-3 }; -static s16 ssd1351_init[] = { +static const s16 ssd1351_init[] = {-1 ,0xfd ,0x12 ,-1 ,0xfd ,0xb1 ,-1 ,0xae ,
Signature · 1 line
2.10.0.rc2.1.g053435c