staging: fbtft: Do not use binary constants

Gcc < 4.3 doesn't understand binary constants (0b*):

drivers/staging/fbtft/fbtft-sysfs.c:156:19: error: invalid suffix "b111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:3: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:11: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:19: error: invalid suffix "b11111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:28: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:36: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:44: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:52: error: invalid suffix "b11111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:160:3: error: invalid suffix "b111" on integer constant
...

Hence use hexadecimal constants (0x*) instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/fbtft/fb_hx8340bn.c b/drivers/staging/fbtft/fb_hx8340bn.c
index 53edf253ed63a7619a3f2d1a159832401b3552a1..cfe2b5b805cb7f05e8ed032a2db3d1626b52e4b5 100644 (file)
--- a/drivers/staging/fbtft/fb_hx8340bn.c
+++ b/drivers/staging/fbtft/fb_hx8340bn.c
@@ -149,10 +149,10 @@ static int set_var(struct fbtft_par *par)
 static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 {
        unsigned long mask[] = {
-               0b1111, 0b1111, 0b11111, 0b1111, 0b1111, 0b1111, 0b11111,
-               0b111, 0b111, 0b111, 0b111, 0b111, 0b111, 0b11, 0b11,
-               0b1111, 0b1111, 0b11111, 0b1111, 0b1111, 0b1111, 0b11111,
-               0b111, 0b111, 0b111, 0b111, 0b111, 0b111, 0b0, 0b0 };
+               0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x1f, 0x07, 0x07, 0x07,
+               0x07, 0x07, 0x07, 0x03, 0x03, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f,
+               0x0f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00,
+       };
        int i, j;
 
        /* apply mask */

diff --git a/drivers/staging/fbtft/fb_hx8347d.c b/drivers/staging/fbtft/fb_hx8347d.c
index 8139a8f587b75549d4c1297883f109d6f41e07d7..03ae95b4f79e80e174ee4a2c9c733e97fd783be6 100644 (file)
--- a/drivers/staging/fbtft/fb_hx8347d.c
+++ b/drivers/staging/fbtft/fb_hx8347d.c
@@ -115,10 +115,9 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
 static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 {
        unsigned long mask[] = {
-               0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
-               0b1111111, 0b1111111,
-               0b11111, 0b11111, 0b11111, 0b11111, 0b11111,
-               0b1111};
+               0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x1f, 0x1f,
+               0x1f, 0x1f, 0x1f, 0x0f,
+       };
        int i, j;
        int acc = 0;
 

diff --git a/drivers/staging/fbtft/fb_ili9320.c b/drivers/staging/fbtft/fb_ili9320.c
index 880f548158e68be8bd4999372958af1eeb1e1801..3a02edd447d4908b585f5e58ad24bd54e47b5a66 100644 (file)
--- a/drivers/staging/fbtft/fb_ili9320.c
+++ b/drivers/staging/fbtft/fb_ili9320.c
@@ -179,10 +179,9 @@ static int set_var(struct fbtft_par *par)
 static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 {
        unsigned long mask[] = {
-               0b11111, 0b11111, 0b111, 0b111, 0b111,
-               0b111, 0b111, 0b111, 0b111, 0b111,
-               0b11111, 0b11111, 0b111, 0b111, 0b111,
-               0b111, 0b111, 0b111, 0b111, 0b111 };
+               0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+               0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+       };
        int i, j;
 
        fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);

diff --git a/drivers/staging/fbtft/fb_ili9325.c b/drivers/staging/fbtft/fb_ili9325.c
index 5f88145fac9be568702a0c7d24ad26141cf1c190..19d254e9a4206c729a777cff079318f6ee7cc7e8 100644 (file)
--- a/drivers/staging/fbtft/fb_ili9325.c
+++ b/drivers/staging/fbtft/fb_ili9325.c
@@ -41,22 +41,22 @@ static unsigned bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */
 module_param(bt, uint, 0);
 MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits");
 
-static unsigned vc = 0b011; /* Vci1=Vci*0.80 */
+static unsigned vc = 0x03; /* Vci1=Vci*0.80 */
 module_param(vc, uint, 0);
 MODULE_PARM_DESC(vc,
 "Sets the ratio factor of Vci to generate the reference voltages Vci1");
 
-static unsigned vrh = 0b1101; /* VREG1OUT=Vci*1.85 */
+static unsigned vrh = 0x0d; /* VREG1OUT=Vci*1.85 */
 module_param(vrh, uint, 0);
 MODULE_PARM_DESC(vrh,
 "Set the amplifying rate (1.6 ~ 1.9) of Vci applied to output the VREG1OUT");
 
-static unsigned vdv = 0b10010; /* VCOMH amplitude=VREG1OUT*0.98 */
+static unsigned vdv = 0x12; /* VCOMH amplitude=VREG1OUT*0.98 */
 module_param(vdv, uint, 0);
 MODULE_PARM_DESC(vdv,
 "Select the factor of VREG1OUT to set the amplitude of Vcom");
 
-static unsigned vcm = 0b001010; /* VCOMH=VREG1OUT*0.735 */
+static unsigned vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */
 module_param(vcm, uint, 0);
 MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage");
 
@@ -108,11 +108,11 @@ static int init_display(struct fbtft_par *par)
        if (par->gpio.cs != -1)
                gpio_set_value(par->gpio.cs, 0);  /* Activate chip */
 
-       bt &= 0b111;
-       vc &= 0b111;
-       vrh &= 0b1111;
-       vdv &= 0b11111;
-       vcm &= 0b111111;
+       bt &= 0x07;
+       vc &= 0x07;
+       vrh &= 0x0f;
+       vdv &= 0x1f;
+       vcm &= 0x3f;
 
        /* Initialization sequence from ILI9325 Application Notes */
 
@@ -137,7 +137,7 @@ static int init_display(struct fbtft_par *par)
        write_reg(par, 0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */
        mdelay(200); /* Dis-charge capacitor power voltage */
        write_reg(par, 0x0010, /* SAP, BT[3:0], AP, DSTB, SLP, STB */
-               (1 << 12) | (bt << 8) | (1 << 7) | (0b001 << 4));
+               (1 << 12) | (bt << 8) | (1 << 7) | (0x01 << 4));
        write_reg(par, 0x0011, 0x220 | vc); /* DC1[2:0], DC0[2:0], VC[2:0] */
        mdelay(50); /* Delay 50ms */
        write_reg(par, 0x0012, vrh); /* Internal reference voltage= Vci; */
@@ -233,10 +233,9 @@ static int set_var(struct fbtft_par *par)
 static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 {
        unsigned long mask[] = {
-               0b11111, 0b11111, 0b111, 0b111, 0b111,
-               0b111, 0b111, 0b111, 0b111, 0b111,
-               0b11111, 0b11111, 0b111, 0b111, 0b111,
-               0b111, 0b111, 0b111, 0b111, 0b111 };
+               0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+               0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+       };
        int i, j;
 
        fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);

diff --git a/drivers/staging/fbtft/fb_s6d1121.c b/drivers/staging/fbtft/fb_s6d1121.c
index 7bbb21b28effafab928e689874fb4986d3574ff9..2e1b72ad54aa95e408136002442ac3584052df1a 100644 (file)
--- a/drivers/staging/fbtft/fb_s6d1121.c
+++ b/drivers/staging/fbtft/fb_s6d1121.c
@@ -143,12 +143,10 @@ static int set_var(struct fbtft_par *par)
 static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 {
        unsigned long mask[] = {
-               0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
-               0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
-               0b11111, 0b11111,
-               0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
-               0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
-               0b11111, 0b11111 };
+               0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+               0x3f, 0x3f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+               0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f,
+       };
        int i, j;
 
        fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);

diff --git a/drivers/staging/fbtft/fb_ssd1289.c b/drivers/staging/fbtft/fb_ssd1289.c
index ef46fbca27004c89b03f4e8a3f5ea5938dd48a4e..17a77e0614987d5ad021dbedab11dce48d6e258b 100644 (file)
--- a/drivers/staging/fbtft/fb_ssd1289.c
+++ b/drivers/staging/fbtft/fb_ssd1289.c
@@ -126,16 +126,16 @@ static int set_var(struct fbtft_par *par)
 
        switch (par->info->var.rotate) {
        case 0:
-               write_reg(par, 0x11, reg11 | 0b110000);
+               write_reg(par, 0x11, reg11 | 0x30);
                break;
        case 270:
-               write_reg(par, 0x11, reg11 | 0b101000);
+               write_reg(par, 0x11, reg11 | 0x28);
                break;
        case 180:
-               write_reg(par, 0x11, reg11 | 0b000000);
+               write_reg(par, 0x11, reg11 | 0x00);
                break;
        case 90:
-               write_reg(par, 0x11, reg11 | 0b011000);
+               write_reg(par, 0x11, reg11 | 0x18);
                break;
        }
 
@@ -151,10 +151,9 @@ static int set_var(struct fbtft_par *par)
 static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 {
        unsigned long mask[] = {
-               0b11111, 0b11111, 0b111, 0b111, 0b111,
-               0b111, 0b111, 0b111, 0b111, 0b111,
-               0b11111, 0b11111, 0b111, 0b111, 0b111,
-               0b111, 0b111, 0b111, 0b111, 0b111 };
+               0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+               0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+       };
        int i, j;
 
        fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);

diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c
index fd492b4eaad6fef2810d3259b4c469502a8738c9..9bcd7a0aeed4b035caac6d00a0e2dc195fc4c834 100644 (file)
--- a/drivers/staging/fbtft/fb_ssd1351.c
+++ b/drivers/staging/fbtft/fb_ssd1351.c
@@ -87,16 +87,16 @@ static int set_var(struct fbtft_par *par)
 
        switch (par->info->var.rotate) {
        case 0:
-               write_reg(par, 0xA0, remap | 0b00 | 1<<4);
+               write_reg(par, 0xA0, remap | 0x00 | 1<<4);
                break;
        case 270:
-               write_reg(par, 0xA0, remap | 0b11 | 1<<4);
+               write_reg(par, 0xA0, remap | 0x03 | 1<<4);
                break;
        case 180:
-               write_reg(par, 0xA0, remap | 0b10);
+               write_reg(par, 0xA0, remap | 0x02);
                break;
        case 90:
-               write_reg(par, 0xA0, remap | 0b01);
+               write_reg(par, 0xA0, remap | 0x01);
                break;
        }
 

diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c
index c1c6e58385a6b69618867fc8380fb2fbaacd5ad1..2a614d5ba26470c8fed99a1e057862dd964509e8 100644 (file)
--- a/drivers/staging/fbtft/fb_st7735r.c
+++ b/drivers/staging/fbtft/fb_st7735r.c
@@ -155,7 +155,7 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
        /* apply mask */
        for (i = 0; i < par->gamma.num_curves; i++)
                for (j = 0; j < par->gamma.num_values; j++)
-                       CURVE(i, j) &= 0b111111;
+                       CURVE(i, j) &= 0x3f;
 
        for (i = 0; i < par->gamma.num_curves; i++)
                write_reg(par, 0xE0 + i,

diff --git a/drivers/staging/fbtft/fbtft-sysfs.c b/drivers/staging/fbtft/fbtft-sysfs.c
index e3eb1f9587b3a861bdcbb9647ce497e400313c37..c4cc452f9f2bf654ba019a71072e65a9ec3cdb28 100644 (file)
--- a/drivers/staging/fbtft/fbtft-sysfs.c
+++ b/drivers/staging/fbtft/fbtft-sysfs.c
@@ -152,7 +152,7 @@ static struct device_attribute gamma_device_attrs[] = {
 
 void fbtft_expand_debug_value(unsigned long *debug)
 {
-       switch (*debug & 0b111) {
+       switch (*debug & 0x7) {
        case 1:
                *debug |= DEBUG_LEVEL_1;
                break;

diff --git a/drivers/staging/fbtft/fbtft_device.c b/drivers/staging/fbtft/fbtft_device.c
index 1afeebb95c5453b1dea60955446b14de48cd877f..1880864c4d7ceb4c404af1de480a08e80d571d3f 100644 (file)
--- a/drivers/staging/fbtft/fbtft_device.c
+++ b/drivers/staging/fbtft/fbtft_device.c
@@ -489,7 +489,7 @@ static struct fbtft_device_display displays[] = {
                                        .buswidth = 8,
                                        .backlight = 1,
                                },
-                               .startbyte = 0b01110000,
+                               .startbyte = 0x70,
                                .bgr = true,
                                .gpios = (const struct fbtft_gpio []) {
                                        { "reset", 25 },
@@ -510,7 +510,7 @@ static struct fbtft_device_display displays[] = {
                                        .backlight = 1,
                                        .init_sequence = hy28b_init_sequence,
                                },
-                               .startbyte = 0b01110000,
+                               .startbyte = 0x70,
                                .bgr = true,
                                .fps = 50,
                                .gpios = (const struct fbtft_gpio []) {
@@ -623,7 +623,7 @@ static struct fbtft_device_display displays[] = {
                                        .buswidth = 8,
                                        .backlight = 1,
                                },
-                               .startbyte = 0b01110000,
+                               .startbyte = 0x70,
                                .bgr = true,
                                .gpios = (const struct fbtft_gpio []) {
                                        { "reset", 25 },