p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: fbtft: Fix 'line over 80 characters' 

This patch fixes the following checkpatch.pl warning
WARNING: line over 80 characters

Signed-off-by: Maninder Singh <maninder.s2@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Maninder Singh 2016-11-08 17:55:36 +05:30 committed by Greg Kroah-Hartman
parent fbcda65053
commit 1007e6136c
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/fbtft/fbtft-core.c
View File

@ -253,7 +253,8 @@ static int fbtft_backlight_update_status(struct backlight_device *bd)
"%s: polarity=%d, power=%d, fb_blank=%d\n", "%s: polarity=%d, power=%d, fb_blank=%d\n",
__func__, polarity, bd->props.power, bd->props.fb_blank); __func__, polarity, bd->props.power, bd->props.fb_blank);
if ((bd->props.power == FB_BLANK_UNBLANK) && (bd->props.fb_blank == FB_BLANK_UNBLANK)) if ((bd->props.power == FB_BLANK_UNBLANK) &&
(bd->props.fb_blank == FB_BLANK_UNBLANK))
gpio_set_value(par->gpio.led[0], polarity); gpio_set_value(par->gpio.led[0], polarity);
else else
gpio_set_value(par->gpio.led[0], !polarity); gpio_set_value(par->gpio.led[0], !polarity);
@ -299,7 +300,8 @@ void fbtft_register_backlight(struct fbtft_par *par)
bl_props.state |= BL_CORE_DRIVER1; bl_props.state |= BL_CORE_DRIVER1;
bd = backlight_device_register(dev_driver_string(par->info->device), bd = backlight_device_register(dev_driver_string(par->info->device),
par->info->device, par, &fbtft_bl_ops, &bl_props); par->info->device, par,
&fbtft_bl_ops, &bl_props);
if (IS_ERR(bd)) { if (IS_ERR(bd)) {
dev_err(par->info->device, dev_err(par->info->device,
"cannot register backlight device (%ld)\n", "cannot register backlight device (%ld)\n",
@ -350,9 +352,11 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
bool timeit = false; bool timeit = false;
int ret = 0; int ret = 0;
if (unlikely(par->debug & (DEBUG_TIME_FIRST_UPDATE | DEBUG_TIME_EACH_UPDATE))) { if (unlikely(par->debug & (DEBUG_TIME_FIRST_UPDATE |
DEBUG_TIME_EACH_UPDATE))) {
if ((par->debug & DEBUG_TIME_EACH_UPDATE) || if ((par->debug & DEBUG_TIME_EACH_UPDATE) ||
((par->debug & DEBUG_TIME_FIRST_UPDATE) && !par->first_update_done)) { ((par->debug & DEBUG_TIME_FIRST_UPDATE) &&
!par->first_update_done)) {
ts_start = ktime_get(); ts_start = ktime_get();
timeit = true; timeit = true;
} }
@ -361,15 +365,17 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
/* Sanity checks */ /* Sanity checks */
if (start_line > end_line) { if (start_line > end_line) {
dev_warn(par->info->device, dev_warn(par->info->device,
"%s: start_line=%u is larger than end_line=%u. Shouldn't happen, will do full display update\n", "%s: start_line=%u is larger than end_line=%u. Shouldn't happen, will do full display update\n",
__func__, start_line, end_line); __func__, start_line, end_line);
start_line = 0; start_line = 0;
end_line = par->info->var.yres - 1; end_line = par->info->var.yres - 1;
} }
if (start_line > par->info->var.yres - 1 || end_line > par->info->var.yres - 1) { if (start_line > par->info->var.yres - 1 ||
end_line > par->info->var.yres - 1) {
dev_warn(par->info->device, dev_warn(par->info->device,
"%s: start_line=%u or end_line=%u is larger than max=%d. Shouldn't happen, will do full display update\n", "%s: start_line=%u or end_line=%u is larger than max=%d. Shouldn't happen, will do full display update\n",
__func__, start_line, end_line, par->info->var.yres - 1); __func__, start_line,
end_line, par->info->var.yres - 1);
start_line = 0; start_line = 0;
end_line = par->info->var.yres - 1; end_line = par->info->var.yres - 1;
} }
@ -665,7 +671,8 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
unsigned long *gamma_curves = NULL; unsigned long *gamma_curves = NULL;
/* sanity check */ /* sanity check */
if (display->gamma_num * display->gamma_len > FBTFT_GAMMA_MAX_VALUES_TOTAL) { if (display->gamma_num * display->gamma_len >
FBTFT_GAMMA_MAX_VALUES_TOTAL) {
dev_err(dev, "FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n", dev_err(dev, "FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n",
FBTFT_GAMMA_MAX_VALUES_TOTAL); FBTFT_GAMMA_MAX_VALUES_TOTAL);
return NULL; return NULL;
@ -832,11 +839,13 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
#ifdef CONFIG_HAS_DMA #ifdef CONFIG_HAS_DMA
if (dma) { if (dma) {
dev->coherent_dma_mask = ~0; dev->coherent_dma_mask = ~0;
txbuf = dmam_alloc_coherent(dev, txbuflen, &par->txbuf.dma, GFP_DMA); txbuf = dmam_alloc_coherent(dev, txbuflen,
&par->txbuf.dma, GFP_DMA);
} else } else
#endif #endif
{ {
txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL); txbuf = devm_kzalloc(par->info->device,
txbuflen, GFP_KERNEL);
} }
if (!txbuf) if (!txbuf)
goto alloc_fail; goto alloc_fail;