Merge tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[firefly-linux-kernel-4.4.55.git] / drivers / staging / fbtft / fb_ssd1331.c

diff --git a/drivers/staging/fbtft/fb_ssd1331.c b/drivers/staging/fbtft/fb_ssd1331.c
index da7464f90e37c93849b05224daeb494c61cb846b..5bb741046c85264104c4160f17d2b2be3d3d31e5 100644 (file)
--- a/drivers/staging/fbtft/fb_ssd1331.c
+++ b/drivers/staging/fbtft/fb_ssd1331.c
@@ -29,24 +29,24 @@ static int init_display(struct fbtft_par *par)
 
        write_reg(par, 0xae); /* Display Off */
        write_reg(par, 0xa0, 0x70 | (par->bgr << 2)); /* Set Colour Depth */
-       write_reg(par, 0x72); // RGB colour
+       write_reg(par, 0x72); /* RGB colour */
        write_reg(par, 0xa1, 0x00); /* Set Display Start Line */
        write_reg(par, 0xa2, 0x00); /* Set Display Offset */
        write_reg(par, 0xa4); /* NORMALDISPLAY */
-       write_reg(par, 0xa8, 0x3f); // Set multiplex
-       write_reg(par, 0xad, 0x8e); // Set master
-       // write_reg(par, 0xb0, 0x0b); // Set power mode
-       write_reg(par, 0xb1, 0x31); // Precharge
-       write_reg(par, 0xb3, 0xf0); // Clock div
-       write_reg(par, 0x8a, 0x64); // Precharge A
-       write_reg(par, 0x8b, 0x78); // Precharge B
-       write_reg(par, 0x8c, 0x64); // Precharge C
-       write_reg(par, 0xbb, 0x3a); // Precharge level
-       write_reg(par, 0xbe, 0x3e); // vcomh
-       write_reg(par, 0x87, 0x06); // Master current
-       write_reg(par, 0x81, 0x91); // Contrast A
-       write_reg(par, 0x82, 0x50); // Contrast B
-       write_reg(par, 0x83, 0x7d); // Contrast C
+       write_reg(par, 0xa8, 0x3f); /* Set multiplex */
+       write_reg(par, 0xad, 0x8e); /* Set master */
+       /* write_reg(par, 0xb0, 0x0b);  Set power mode */
+       write_reg(par, 0xb1, 0x31); /* Precharge */
+       write_reg(par, 0xb3, 0xf0); /* Clock div */
+       write_reg(par, 0x8a, 0x64); /* Precharge A */
+       write_reg(par, 0x8b, 0x78); /* Precharge B */
+       write_reg(par, 0x8c, 0x64); /* Precharge C */
+       write_reg(par, 0xbb, 0x3a); /* Precharge level */
+       write_reg(par, 0xbe, 0x3e); /* vcomh */
+       write_reg(par, 0x87, 0x06); /* Master current */
+       write_reg(par, 0x81, 0x91); /* Contrast A */
+       write_reg(par, 0x82, 0x50); /* Contrast B */
+       write_reg(par, 0x83, 0x7d); /* Contrast C */
        write_reg(par, 0xaf); /* Set Sleep Mode Display On */
 
        return 0;
@@ -69,9 +69,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
 
        if (unlikely(par->debug & DEBUG_WRITE_REGISTER)) {
                va_start(args, len);
-               for (i = 0; i < len; i++) {
+               for (i = 0; i < len; i++)
                        buf[i] = (u8)va_arg(args, unsigned int);
-               }
                va_end(args);
                fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, u8, buf, len, "%s: ", __func__);
        }
@@ -84,20 +83,21 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
        ret = par->fbtftops.write(par, par->buf, sizeof(u8));
        if (ret < 0) {
                va_end(args);
-               dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret);
+               dev_err(par->info->device,
+                       "write() failed and returned %d\n", ret);
                return;
        }
        len--;
 
        if (len) {
                i = len;
-               while (i--) {
+               while (i--)
                        *buf++ = (u8)va_arg(args, unsigned int);
-               }
                ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8)));
                if (ret < 0) {
                        va_end(args);
-                       dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret);
+                       dev_err(par->info->device,
+                               "write() failed and returned %d\n", ret);
                        return;
                }
        }