Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22eb36b8 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: fbtft: change 'gamma' array to u32 



Having a local variable of 1024 bytes on 64-bit architectures is a bit
too much, and I ran into this warning while trying to see what functions
use the largest stack:

drivers/staging/fbtft/fbtft-sysfs.c: In function 'store_gamma_curve':
drivers/staging/fbtft/fbtft-sysfs.c:132:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]

As there is no need for 64-bit gamma values (on 32-bit architectures,
we don't use those either), I'm changing the type from 'unsigned long'
to 'u32' here, which cuts the required space in half everywhere.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26190d41

drivers/staging/fbtft/fb_hx8340bn.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int set_var(struct fbtft_par *par) 
 *   ON0 ON1 CN0 CN1 CN2 CN3 CN4 MN0 MN1 MN2 MN3 MN4 MN5 XXXX  GC

 */

#define CURVE(num, idx)  curves[num * par->gamma.num_values + idx]

static int set_gamma(struct fbtft_par *par, unsigned long *curves)

static int set_gamma(struct fbtft_par *par, u32 *curves)

{

	unsigned long mask[] = {

		0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x1f, 0x07, 0x07, 0x07,

drivers/staging/fbtft/fb_hx8347d.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) 
 *   VRN0 VRN1 VRN2 VRN3 VRN4 VRN5 PRN0 PRN1 PKN0 PKN1 PKN2 PKN3 PKN4 CGM

 */

#define CURVE(num, idx)  curves[num * par->gamma.num_values + idx]

static int set_gamma(struct fbtft_par *par, unsigned long *curves)

static int set_gamma(struct fbtft_par *par, u32 *curves)

{

	unsigned long mask[] = {

		0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x1f, 0x1f,

drivers/staging/fbtft/fb_hx8353d.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int set_var(struct fbtft_par *par) 
}



/* gamma string format: */

static int set_gamma(struct fbtft_par *par, unsigned long *curves)

static int set_gamma(struct fbtft_par *par, u32 *curves)

{

	write_reg(par, 0xE0,

		  curves[0], curves[1], curves[2], curves[3],

drivers/staging/fbtft/fb_ili9163.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int set_var(struct fbtft_par *par) 


#ifdef GAMMA_ADJ

#define CURVE(num, idx)  curves[num * par->gamma.num_values + idx]

static int gamma_adj(struct fbtft_par *par, unsigned long *curves)

static int gamma_adj(struct fbtft_par *par, u32 *curves)

{

	unsigned long mask[] = {

		0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

drivers/staging/fbtft/fb_ili9320.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int set_var(struct fbtft_par *par) 
 *  VRN0 VRN1 RN0 RN1 KN0 KN1 KN2 KN3 KN4 KN5

 */

#define CURVE(num, idx)  curves[num * par->gamma.num_values + idx]

static int set_gamma(struct fbtft_par *par, unsigned long *curves)

static int set_gamma(struct fbtft_par *par, u32 *curves)

{

	unsigned long mask[] = {

		0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,