Trying to keep the code in the 80-char line limit.

Signed-off-by: Leonardo Brás <leobra...@gmail.com>

diff --git a/drivers/staging/fbtft/fb_ssd1306.c 
b/drivers/staging/fbtft/fb_ssd1306.c
index 9276be499303..f5e0ec1c01dc 100644
--- a/drivers/staging/fbtft/fb_ssd1306.c
+++ b/drivers/staging/fbtft/fb_ssd1306.c
@@ -184,7 +184,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, 
size_t len)
                for (y = 0; y < yres / 8; y++) {
                        *buf = 0x00;
                        for (i = 0; i < 8; i++)
-                               *buf |= (vmem16[(y * 8 + i) * xres + x] ? 1 : 
0) << i;
+                               *buf |= (vmem16[(y * 8 + i) * xres + x] ?
+                                        1 : 0) << i;
                        buf++;
                }
        }
diff --git a/drivers/staging/fbtft/fb_ssd1331.c 
b/drivers/staging/fbtft/fb_ssd1331.c
index 383e197cf56a..e2b3ba82d01f 100644
--- a/drivers/staging/fbtft/fb_ssd1331.c
+++ b/drivers/staging/fbtft/fb_ssd1331.c
@@ -74,7 +74,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, 
...)
                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__);
+               fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device,
+                                 u8, buf, len, "%s: ", __func__);
        }

        va_start(args, len);
diff --git a/drivers/staging/fbtft/fb_st7735r.c 
b/drivers/staging/fbtft/fb_st7735r.c
index 9670a8989b91..c8e94f388ce5 100644
--- a/drivers/staging/fbtft/fb_st7735r.c
+++ b/drivers/staging/fbtft/fb_st7735r.c
@@ -130,8 +130,10 @@ static int set_var(struct fbtft_par *par)

 /*
  * Gamma string format:
- * VRF0P VOS0P PK0P PK1P PK2P PK3P PK4P PK5P PK6P PK7P PK8P PK9P SELV0P SELV1P 
SELV62P SELV63P
- * VRF0N VOS0N PK0N PK1N PK2N PK3N PK4N PK5N PK6N PK7N PK8N PK9N SELV0N SELV1N 
SELV62N SELV63N
+ * VRF0P VOS0P PK0P PK1P PK2P PK3P PK4P
+ *            PK5P PK6P PK7P PK8P PK9P SELV0P SELV1P SELV62P SELV63P
+ * VRF0N VOS0N PK0N PK1N PK2N PK3N PK4N
+ *            PK5N PK6N PK7N PK8N PK9N SELV0N SELV1N SELV62N SELV63N
  */
 #define CURVE(num, idx)  curves[(num) * par->gamma.num_values + (idx)]
 static int set_gamma(struct fbtft_par *par, u32 *curves)
diff --git a/drivers/staging/fbtft/fbtft-core.c 
b/drivers/staging/fbtft/fbtft-core.c
index a03d8adf3f9a..64f69d1a3029 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -538,9 +538,9 @@ static unsigned int chan_to_field(unsigned int chan, struct 
fb_bitfield *bf)
        return chan << bf->offset;
 }

-static int fbtft_fb_setcolreg(unsigned int regno, unsigned int red, unsigned 
int green,
-                             unsigned int blue, unsigned int transp,
-                             struct fb_info *info)
+static int fbtft_fb_setcolreg(unsigned int regno, unsigned int red,
+                             unsigned int green, unsigned int blue,
+                             unsigned int transp, struct fb_info *info)
 {
        unsigned int val;
        int ret = 1;
diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 798a8fe98e95..87114502e836 100644
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -348,11 +348,29 @@ module_exit(fbtft_driver_module_exit);

 /* shorthand debug levels */
 #define DEBUG_LEVEL_1  DEBUG_REQUEST_GPIOS
-#define DEBUG_LEVEL_2  (DEBUG_LEVEL_1 | DEBUG_DRIVER_INIT_FUNCTIONS | 
DEBUG_TIME_FIRST_UPDATE)
-#define DEBUG_LEVEL_3  (DEBUG_LEVEL_2 | DEBUG_RESET | DEBUG_INIT_DISPLAY | 
DEBUG_BLANK | DEBUG_REQUEST_GPIOS | DEBUG_FREE_GPIOS | DEBUG_VERIFY_GPIOS | 
DEBUG_BACKLIGHT | DEBUG_SYSFS)
-#define DEBUG_LEVEL_4  (DEBUG_LEVEL_2 | DEBUG_FB_READ | DEBUG_FB_WRITE | 
DEBUG_FB_FILLRECT | DEBUG_FB_COPYAREA | DEBUG_FB_IMAGEBLIT | DEBUG_FB_BLANK)
-#define DEBUG_LEVEL_5  (DEBUG_LEVEL_3 | DEBUG_UPDATE_DISPLAY)
-#define DEBUG_LEVEL_6  (DEBUG_LEVEL_4 | DEBUG_LEVEL_5)
+#define DEBUG_LEVEL_2  (DEBUG_LEVEL_1 |\
+                        DEBUG_DRIVER_INIT_FUNCTIONS |\
+                        DEBUG_TIME_FIRST_UPDATE)
+#define DEBUG_LEVEL_3  (DEBUG_LEVEL_2 |\
+                        DEBUG_RESET |\
+                        DEBUG_INIT_DISPLAY |\
+                        DEBUG_BLANK |\
+                        DEBUG_REQUEST_GPIOS |\
+                        DEBUG_FREE_GPIOS |\
+                        DEBUG_VERIFY_GPIOS |\
+                        DEBUG_BACKLIGHT |\
+                        DEBUG_SYSFS)
+#define DEBUG_LEVEL_4  (DEBUG_LEVEL_2 |\
+                        DEBUG_FB_READ |\
+                        DEBUG_FB_WRITE |\
+                        DEBUG_FB_FILLRECT |\
+                        DEBUG_FB_COPYAREA |\
+                        DEBUG_FB_IMAGEBLIT |\
+                        DEBUG_FB_BLANK)
+#define DEBUG_LEVEL_5  (DEBUG_LEVEL_3 |\
+                        DEBUG_UPDATE_DISPLAY)
+#define DEBUG_LEVEL_6  (DEBUG_LEVEL_4 |\
+                        DEBUG_LEVEL_5)
 #define DEBUG_LEVEL_7  0xFFFFFFFF

 #define DEBUG_DRIVER_INIT_FUNCTIONS (1<<3)
diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c
index a2b4164ce5e4..af6c330cdf8d 100644
--- a/drivers/staging/fbtft/flexfb.c
+++ b/drivers/staging/fbtft/flexfb.c
@@ -667,11 +667,14 @@ static int flexfb_probe_common(struct spi_device *sdev,
                case 8:
                        par->fbtftops.write_vmem = fbtft_write_vmem16_bus8;
                        if (!par->startbyte)
-                               par->fbtftops.verify_gpios = 
flexfb_verify_gpios_dc;
+                               par->fbtftops.verify_gpios =
+                                               flexfb_verify_gpios_dc;
                        break;
                case 9:
                        if (regwidth == 16) {
-                               dev_err(dev, "argument 'regwidth': %d is not 
supported with buswidth=%d and SPI.\n", regwidth, buswidth);
+                               dev_err(dev,
+                                       "argument 'regwidth': %d is not 
supported with buswidth=%d and SPI.\n",
+                                       regwidth, buswidth);
                                return -EINVAL;
                        }
                        par->fbtftops.write_register = fbtft_write_reg8_bus9;
@@ -709,13 +712,16 @@ static int flexfb_probe_common(struct spi_device *sdev,
                case 16:
                        par->fbtftops.write_register = fbtft_write_reg16_bus16;
                        if (latched)
-                               par->fbtftops.write = 
fbtft_write_gpio16_wr_latched;
+                               par->fbtftops.write =
+                                               fbtft_write_gpio16_wr_latched;
                        else
                                par->fbtftops.write = fbtft_write_gpio16_wr;
                        par->fbtftops.write_vmem = fbtft_write_vmem16_bus16;
                        break;
                default:
-                       dev_err(dev, "argument 'buswidth': %d is not supported 
with parallel.\n", buswidth);
+                       dev_err(dev,
+                               "argument 'buswidth': %d is not supported with 
parallel.\n",
+                               buswidth);
                        return -EINVAL;
                }
        }
---
 drivers/staging/fbtft/fb_ssd1306.c |  3 ++-
 drivers/staging/fbtft/fb_ssd1331.c |  3 ++-
 drivers/staging/fbtft/fb_st7735r.c |  6 ++++--
 drivers/staging/fbtft/fbtft-core.c |  6 +++---
 drivers/staging/fbtft/fbtft.h      | 28 +++++++++++++++++++++++-----
 drivers/staging/fbtft/flexfb.c     | 14 ++++++++++----
 6 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/fbtft/fb_ssd1306.c 
b/drivers/staging/fbtft/fb_ssd1306.c
index 9276be499303..f5e0ec1c01dc 100644
--- a/drivers/staging/fbtft/fb_ssd1306.c
+++ b/drivers/staging/fbtft/fb_ssd1306.c
@@ -184,7 +184,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, 
size_t len)
                for (y = 0; y < yres / 8; y++) {
                        *buf = 0x00;
                        for (i = 0; i < 8; i++)
-                               *buf |= (vmem16[(y * 8 + i) * xres + x] ? 1 : 
0) << i;
+                               *buf |= (vmem16[(y * 8 + i) * xres + x] ?
+                                        1 : 0) << i;
                        buf++;
                }
        }
diff --git a/drivers/staging/fbtft/fb_ssd1331.c 
b/drivers/staging/fbtft/fb_ssd1331.c
index 383e197cf56a..e2b3ba82d01f 100644
--- a/drivers/staging/fbtft/fb_ssd1331.c
+++ b/drivers/staging/fbtft/fb_ssd1331.c
@@ -74,7 +74,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, 
...)
                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__);
+               fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device,
+                                 u8, buf, len, "%s: ", __func__);
        }
 
        va_start(args, len);
diff --git a/drivers/staging/fbtft/fb_st7735r.c 
b/drivers/staging/fbtft/fb_st7735r.c
index 9670a8989b91..c8e94f388ce5 100644
--- a/drivers/staging/fbtft/fb_st7735r.c
+++ b/drivers/staging/fbtft/fb_st7735r.c
@@ -130,8 +130,10 @@ static int set_var(struct fbtft_par *par)
 
 /*
  * Gamma string format:
- * VRF0P VOS0P PK0P PK1P PK2P PK3P PK4P PK5P PK6P PK7P PK8P PK9P SELV0P SELV1P 
SELV62P SELV63P
- * VRF0N VOS0N PK0N PK1N PK2N PK3N PK4N PK5N PK6N PK7N PK8N PK9N SELV0N SELV1N 
SELV62N SELV63N
+ * VRF0P VOS0P PK0P PK1P PK2P PK3P PK4P
+ *            PK5P PK6P PK7P PK8P PK9P SELV0P SELV1P SELV62P SELV63P
+ * VRF0N VOS0N PK0N PK1N PK2N PK3N PK4N
+ *            PK5N PK6N PK7N PK8N PK9N SELV0N SELV1N SELV62N SELV63N
  */
 #define CURVE(num, idx)  curves[(num) * par->gamma.num_values + (idx)]
 static int set_gamma(struct fbtft_par *par, u32 *curves)
diff --git a/drivers/staging/fbtft/fbtft-core.c 
b/drivers/staging/fbtft/fbtft-core.c
index a03d8adf3f9a..64f69d1a3029 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -538,9 +538,9 @@ static unsigned int chan_to_field(unsigned int chan, struct 
fb_bitfield *bf)
        return chan << bf->offset;
 }
 
-static int fbtft_fb_setcolreg(unsigned int regno, unsigned int red, unsigned 
int green,
-                             unsigned int blue, unsigned int transp,
-                             struct fb_info *info)
+static int fbtft_fb_setcolreg(unsigned int regno, unsigned int red,
+                             unsigned int green, unsigned int blue,
+                             unsigned int transp, struct fb_info *info)
 {
        unsigned int val;
        int ret = 1;
diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 798a8fe98e95..87114502e836 100644
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -348,11 +348,29 @@ module_exit(fbtft_driver_module_exit);
 
 /* shorthand debug levels */
 #define DEBUG_LEVEL_1  DEBUG_REQUEST_GPIOS
-#define DEBUG_LEVEL_2  (DEBUG_LEVEL_1 | DEBUG_DRIVER_INIT_FUNCTIONS | 
DEBUG_TIME_FIRST_UPDATE)
-#define DEBUG_LEVEL_3  (DEBUG_LEVEL_2 | DEBUG_RESET | DEBUG_INIT_DISPLAY | 
DEBUG_BLANK | DEBUG_REQUEST_GPIOS | DEBUG_FREE_GPIOS | DEBUG_VERIFY_GPIOS | 
DEBUG_BACKLIGHT | DEBUG_SYSFS)
-#define DEBUG_LEVEL_4  (DEBUG_LEVEL_2 | DEBUG_FB_READ | DEBUG_FB_WRITE | 
DEBUG_FB_FILLRECT | DEBUG_FB_COPYAREA | DEBUG_FB_IMAGEBLIT | DEBUG_FB_BLANK)
-#define DEBUG_LEVEL_5  (DEBUG_LEVEL_3 | DEBUG_UPDATE_DISPLAY)
-#define DEBUG_LEVEL_6  (DEBUG_LEVEL_4 | DEBUG_LEVEL_5)
+#define DEBUG_LEVEL_2  (DEBUG_LEVEL_1 |\
+                        DEBUG_DRIVER_INIT_FUNCTIONS |\
+                        DEBUG_TIME_FIRST_UPDATE)
+#define DEBUG_LEVEL_3  (DEBUG_LEVEL_2 |\
+                        DEBUG_RESET |\
+                        DEBUG_INIT_DISPLAY |\
+                        DEBUG_BLANK |\
+                        DEBUG_REQUEST_GPIOS |\
+                        DEBUG_FREE_GPIOS |\
+                        DEBUG_VERIFY_GPIOS |\
+                        DEBUG_BACKLIGHT |\
+                        DEBUG_SYSFS)
+#define DEBUG_LEVEL_4  (DEBUG_LEVEL_2 |\
+                        DEBUG_FB_READ |\
+                        DEBUG_FB_WRITE |\
+                        DEBUG_FB_FILLRECT |\
+                        DEBUG_FB_COPYAREA |\
+                        DEBUG_FB_IMAGEBLIT |\
+                        DEBUG_FB_BLANK)
+#define DEBUG_LEVEL_5  (DEBUG_LEVEL_3 |\
+                        DEBUG_UPDATE_DISPLAY)
+#define DEBUG_LEVEL_6  (DEBUG_LEVEL_4 |\
+                        DEBUG_LEVEL_5)
 #define DEBUG_LEVEL_7  0xFFFFFFFF
 
 #define DEBUG_DRIVER_INIT_FUNCTIONS (1<<3)
diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c
index a2b4164ce5e4..af6c330cdf8d 100644
--- a/drivers/staging/fbtft/flexfb.c
+++ b/drivers/staging/fbtft/flexfb.c
@@ -667,11 +667,14 @@ static int flexfb_probe_common(struct spi_device *sdev,
                case 8:
                        par->fbtftops.write_vmem = fbtft_write_vmem16_bus8;
                        if (!par->startbyte)
-                               par->fbtftops.verify_gpios = 
flexfb_verify_gpios_dc;
+                               par->fbtftops.verify_gpios =
+                                               flexfb_verify_gpios_dc;
                        break;
                case 9:
                        if (regwidth == 16) {
-                               dev_err(dev, "argument 'regwidth': %d is not 
supported with buswidth=%d and SPI.\n", regwidth, buswidth);
+                               dev_err(dev,
+                                       "argument 'regwidth': %d is not 
supported with buswidth=%d and SPI.\n",
+                                       regwidth, buswidth);
                                return -EINVAL;
                        }
                        par->fbtftops.write_register = fbtft_write_reg8_bus9;
@@ -709,13 +712,16 @@ static int flexfb_probe_common(struct spi_device *sdev,
                case 16:
                        par->fbtftops.write_register = fbtft_write_reg16_bus16;
                        if (latched)
-                               par->fbtftops.write = 
fbtft_write_gpio16_wr_latched;
+                               par->fbtftops.write =
+                                               fbtft_write_gpio16_wr_latched;
                        else
                                par->fbtftops.write = fbtft_write_gpio16_wr;
                        par->fbtftops.write_vmem = fbtft_write_vmem16_bus16;
                        break;
                default:
-                       dev_err(dev, "argument 'buswidth': %d is not supported 
with parallel.\n", buswidth);
+                       dev_err(dev,
+                               "argument 'buswidth': %d is not supported with 
parallel.\n",
+                               buswidth);
                        return -EINVAL;
                }
        }
-- 
2.18.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to