Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: fbtft: split long strings

Split long function declarations, function calls, comments etc.

Signed-off-by: Anton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Anton Gerasimov and committed by
Greg Kroah-Hartman
3c588452 35e606de

+48 -20
+9 -4
drivers/staging/fbtft/fb_ra8875.c
··· 73 73 fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, 74 74 "%s()\n", __func__); 75 75 fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, 76 - "display size %dx%d\n", par->info->var.xres, par->info->var.yres); 76 + "display size %dx%d\n", 77 + par->info->var.xres, 78 + par->info->var.yres); 77 79 78 80 par->fbtftops.reset(par); 79 81 ··· 103 101 write_reg(par, 0x1D, 0x0E); 104 102 write_reg(par, 0x1E, 0x00); 105 103 write_reg(par, 0x1F, 0x02); 106 - } else if ((par->info->var.xres == 480) && (par->info->var.yres == 272)) { 104 + } else if ((par->info->var.xres == 480) && 105 + (par->info->var.yres == 272)) { 107 106 /* PLL clock frequency */ 108 107 write_reg(par, 0x88, 0x0A); 109 108 write_reg(par, 0x89, 0x02); ··· 128 125 write_reg(par, 0x1D, 0x07); 129 126 write_reg(par, 0x1E, 0x00); 130 127 write_reg(par, 0x1F, 0x09); 131 - } else if ((par->info->var.xres == 640) && (par->info->var.yres == 480)) { 128 + } else if ((par->info->var.xres == 640) && 129 + (par->info->var.yres == 480)) { 132 130 /* PLL clock frequency */ 133 131 write_reg(par, 0x88, 0x0B); 134 132 write_reg(par, 0x89, 0x02); ··· 153 149 write_reg(par, 0x1D, 0x0E); 154 150 write_reg(par, 0x1E, 0x00); 155 151 write_reg(par, 0x1F, 0x01); 156 - } else if ((par->info->var.xres == 800) && (par->info->var.yres == 480)) { 152 + } else if ((par->info->var.xres == 800) && 153 + (par->info->var.yres == 480)) { 157 154 /* PLL clock frequency */ 158 155 write_reg(par, 0x88, 0x0B); 159 156 write_reg(par, 0x89, 0x02);
+8 -3
drivers/staging/fbtft/fb_tls8204.c
··· 35 35 #define WIDTH 84 36 36 #define HEIGHT 48 37 37 #define TXBUFLEN WIDTH 38 - #define DEFAULT_GAMMA "40" /* gamma is used to control contrast in this driver */ 38 + 39 + /* gamma is used to control contrast in this driver */ 40 + #define DEFAULT_GAMMA "40" 39 41 40 42 static unsigned bs = 4; 41 43 module_param(bs, uint, 0); ··· 53 51 write_reg(par, 0x21); /* 5:1 1 54 52 2:0 PD - Powerdown control: chip is active 55 53 1:0 V - Entry mode: horizontal addressing 56 - 0:1 H - Extended instruction set control: extended 54 + 0:1 H - Extended instruction set control: 55 + extended 57 56 */ 58 57 59 58 /* H=1 Bias system */ ··· 86 83 87 84 static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) 88 85 { 89 - fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", __func__, xs, ys, xe, ye); 86 + fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, 87 + "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", 88 + __func__, xs, ys, xe, ye); 90 89 91 90 /* H=0 Set X address of RAM */ 92 91 write_reg(par, 0x80); /* 7:1 1
+2 -1
drivers/staging/fbtft/fbtft_device.c
··· 1063 1063 .display = { 1064 1064 .buswidth = 8, 1065 1065 .backlight = 1, 1066 - .init_sequence = waveshare32b_init_sequence, 1066 + .init_sequence = 1067 + waveshare32b_init_sequence, 1067 1068 }, 1068 1069 .bgr = true, 1069 1070 .gpios = (const struct fbtft_gpio []) {
+29 -12
drivers/staging/fbtft/flexfb.c
··· 134 134 135 135 136 136 /* ili9320, ili9325 */ 137 - static void flexfb_set_addr_win_1(struct fbtft_par *par, int xs, int ys, int xe, int ye) 137 + static void flexfb_set_addr_win_1(struct fbtft_par *par, 138 + int xs, int ys, int xe, int ye) 138 139 { 139 - fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", __func__, xs, ys, xe, ye); 140 + fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, 141 + "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", 142 + __func__, xs, ys, xe, ye); 140 143 switch (par->info->var.rotate) { 141 144 /* R20h = Horizontal GRAM Start Address */ 142 145 /* R21h = Vertical GRAM Start Address */ ··· 164 161 } 165 162 166 163 /* ssd1289 */ 167 - static void flexfb_set_addr_win_2(struct fbtft_par *par, int xs, int ys, int xe, int ye) 164 + static void flexfb_set_addr_win_2(struct fbtft_par *par, 165 + int xs, int ys, int xe, int ye) 168 166 { 169 - fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", __func__, xs, ys, xe, ye); 167 + fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, 168 + "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", 169 + __func__, xs, ys, xe, ye); 170 170 171 171 switch (par->info->var.rotate) { 172 172 /* R4Eh - Set GDDRAM X address counter */ ··· 197 191 } 198 192 199 193 /* ssd1351 */ 200 - static void set_addr_win_3(struct fbtft_par *par, int xs, int ys, int xe, int ye) 194 + static void set_addr_win_3(struct fbtft_par *par, 195 + int xs, int ys, int xe, int ye) 201 196 { 202 - fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", __func__, xs, ys, xe, ye); 197 + fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, 198 + "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", __func__, 199 + xs, ys, xe, ye); 203 200 204 201 write_reg(par, 0x15, xs, xe); 205 202 write_reg(par, 0x75, ys, ye); ··· 214 205 fbtft_par_dbg(DEBUG_VERIFY_GPIOS, par, "%s()\n", __func__); 215 206 216 207 if (par->gpio.dc < 0) { 217 - dev_err(par->info->device, "Missing info about 'dc' gpio. Aborting.\n"); 208 + dev_err(par->info->device, 209 + "Missing info about 'dc' gpio. Aborting.\n"); 218 210 return -EINVAL; 219 211 } 220 212 ··· 245 235 num_db=buswidth/2; 246 236 for (i=0;i < num_db;i++) { 247 237 if (par->gpio.db[i] < 0) { 248 - dev_err(par->info->device, "Missing info about 'db%02d' gpio. Aborting.\n", i); 238 + dev_err(par->info->device, 239 + "Missing info about 'db%02d' gpio. Aborting.\n", 240 + i); 249 241 return -EINVAL; 250 242 } 251 243 } ··· 257 245 258 246 static struct fbtft_display flex_display = { }; 259 247 260 - static int flexfb_probe_common(struct spi_device *sdev, struct platform_device *pdev) 248 + static int flexfb_probe_common(struct spi_device *sdev, 249 + struct platform_device *pdev) 261 250 { 262 251 struct device *dev; 263 252 struct fb_info *info; ··· 273 260 else 274 261 dev = &pdev->dev; 275 262 276 - fbtft_init_dbg(dev, "%s(%s)\n", __func__, sdev ? "'SPI device'" : "'Platform device'"); 263 + fbtft_init_dbg(dev, "%s(%s)\n", __func__, 264 + sdev ? "'SPI device'" : "'Platform device'"); 277 265 278 266 if (chip) { 279 267 ··· 417 403 par->fbtftops.write_register = fbtft_write_reg16_bus8; 418 404 break; 419 405 default: 420 - dev_err(dev, "argument 'regwidth': %d is not supported.\n", regwidth); 406 + dev_err(dev, 407 + "argument 'regwidth': %d is not supported.\n", 408 + regwidth); 421 409 return -EINVAL; 422 410 } 423 411 ··· 499 483 par->fbtftops.set_addr_win = set_addr_win_3; 500 484 break; 501 485 default: 502 - dev_err(dev, "argument 'setaddrwin': unknown value %d.\n", setaddrwin); 486 + dev_err(dev, "argument 'setaddrwin': unknown value %d.\n", 487 + setaddrwin); 503 488 return -EINVAL; 504 489 } 505 490