Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c...

[mirror_ubuntu-artful-kernel.git] / drivers / staging / fbtft / fb_ssd1331.c

diff --git a/drivers/staging/fbtft/fb_ssd1331.c b/drivers/staging/fbtft/fb_ssd1331.c
index 1d74ac1343a808e6a52f55f6532d3cb12eb26feb..26f24e32d979bf9a3b441cacb67285a46cb4446b 100644 (file)
--- a/drivers/staging/fbtft/fb_ssd1331.c
+++ b/drivers/staging/fbtft/fb_ssd1331.c
@@ -122,7 +122,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
  * Setting of GS63 has to be > Setting of GS62 +1
  *
  */
-static int set_gamma(struct fbtft_par *par, unsigned long *curves)
+static int set_gamma(struct fbtft_par *par, u32 *curves)
 {
        unsigned long tmp[GAMMA_NUM * GAMMA_LEN];
        int i, acc = 0;
@@ -145,14 +145,16 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
        }
 
        write_reg(par, 0xB8,
-       tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5], tmp[6], tmp[7],
-       tmp[8], tmp[9], tmp[10], tmp[11], tmp[12], tmp[13], tmp[14], tmp[15],
-       tmp[16], tmp[17], tmp[18], tmp[19], tmp[20], tmp[21], tmp[22], tmp[23],
-       tmp[24], tmp[25], tmp[26], tmp[27], tmp[28], tmp[29], tmp[30], tmp[31],
-       tmp[32], tmp[33], tmp[34], tmp[35], tmp[36], tmp[37], tmp[38], tmp[39],
-       tmp[40], tmp[41], tmp[42], tmp[43], tmp[44], tmp[45], tmp[46], tmp[47],
-       tmp[48], tmp[49], tmp[50], tmp[51], tmp[52], tmp[53], tmp[54], tmp[55],
-       tmp[56], tmp[57], tmp[58], tmp[59], tmp[60], tmp[61], tmp[62]);
+                 tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5], tmp[6],
+                 tmp[7], tmp[8], tmp[9], tmp[10], tmp[11], tmp[12], tmp[13],
+                 tmp[14], tmp[15], tmp[16], tmp[17], tmp[18], tmp[19], tmp[20],
+                 tmp[21], tmp[22], tmp[23], tmp[24], tmp[25], tmp[26], tmp[27],
+                 tmp[28], tmp[29], tmp[30], tmp[31], tmp[32], tmp[33], tmp[34],
+                 tmp[35], tmp[36], tmp[37], tmp[38], tmp[39], tmp[40], tmp[41],
+                 tmp[42], tmp[43], tmp[44], tmp[45], tmp[46], tmp[47], tmp[48],
+                 tmp[49], tmp[50], tmp[51], tmp[52], tmp[53], tmp[54], tmp[55],
+                 tmp[56], tmp[57], tmp[58], tmp[59], tmp[60], tmp[61],
+                 tmp[62]);
 
        return 0;
 }
@@ -160,7 +162,7 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
 static int blank(struct fbtft_par *par, bool on)
 {
        fbtft_par_dbg(DEBUG_BLANK, par, "%s(blank=%s)\n",
-               __func__, on ? "true" : "false");
+                     __func__, on ? "true" : "false");
        if (on)
                write_reg(par, 0xAE);
        else