hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: fbtft: Fixes some alignment issues - Style 

Fixes (most) alignment issues pointed by checkpatch.pl.

Signed-off-by: Leonardo Brás <leobras.c@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Leonardo Brás 2018-08-07 21:28:29 -03:00 committed by Greg Kroah-Hartman
parent 0b1533c6c6
commit 333c7b9405
12 changed files with 106 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/fbtft/fb_ssd1351.c
View File

@ -139,14 +139,22 @@ static int set_gamma(struct fbtft_par *par, u32 *curves)
} }
write_reg(par, 0xB8, write_reg(par, 0xB8,
tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5], tmp[6], tmp[7], tmp[0], tmp[1], tmp[2], tmp[3],
tmp[8], tmp[9], tmp[10], tmp[11], tmp[12], tmp[13], tmp[14], tmp[15], tmp[4], tmp[5], tmp[6], tmp[7],
tmp[16], tmp[17], tmp[18], tmp[19], tmp[20], tmp[21], tmp[22], tmp[23], tmp[8], tmp[9], tmp[10], tmp[11],
tmp[24], tmp[25], tmp[26], tmp[27], tmp[28], tmp[29], tmp[30], tmp[31], tmp[12], tmp[13], tmp[14], tmp[15],
tmp[32], tmp[33], tmp[34], tmp[35], tmp[36], tmp[37], tmp[38], tmp[39], tmp[16], tmp[17], tmp[18], tmp[19],
tmp[40], tmp[41], tmp[42], tmp[43], tmp[44], tmp[45], tmp[46], tmp[47], tmp[20], tmp[21], tmp[22], tmp[23],
tmp[48], tmp[49], tmp[50], tmp[51], tmp[52], tmp[53], tmp[54], tmp[55], tmp[24], tmp[25], tmp[26], tmp[27],
tmp[56], tmp[57], tmp[58], tmp[59], tmp[60], tmp[61], tmp[62]); 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; return 0;
} }
@ -209,7 +217,8 @@ static void register_onboard_backlight(struct fbtft_par *par)
bl_props.power = FB_BLANK_POWERDOWN; bl_props.power = FB_BLANK_POWERDOWN;
bd = backlight_device_register(dev_driver_string(par->info->device), bd = backlight_device_register(dev_driver_string(par->info->device),
par->info->device, par, &bl_ops, &bl_props); par->info->device, par, &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",

13
drivers/staging/fbtft/fb_st7735r.c
View File

@ -145,13 +145,18 @@ static int set_gamma(struct fbtft_par *par, u32 *curves)
for (i = 0; i < par->gamma.num_curves; i++) for (i = 0; i < par->gamma.num_curves; i++)
write_reg(par, 0xE0 + i, write_reg(par, 0xE0 + i,
CURVE(i, 0), CURVE(i, 1), CURVE(i, 2), CURVE(i, 3), CURVE(i, 0), CURVE(i, 1),
CURVE(i, 4), CURVE(i, 5), CURVE(i, 6), CURVE(i, 7), CURVE(i, 2), CURVE(i, 3),
CURVE(i, 8), CURVE(i, 9), CURVE(i, 10), CURVE(i, 11), CURVE(i, 4), CURVE(i, 5),
CURVE(i, 12), CURVE(i, 13), CURVE(i, 14), CURVE(i, 15)); CURVE(i, 6), CURVE(i, 7),
CURVE(i, 8), CURVE(i, 9),
CURVE(i, 10), CURVE(i, 11),
CURVE(i, 12), CURVE(i, 13),
CURVE(i, 14), CURVE(i, 15));
return 0; return 0;
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {

3
drivers/staging/fbtft/fb_st7789v.c
View File

@ -201,8 +201,7 @@ static int set_gamma(struct fbtft_par *par, u32 *curves)
c = i * par->gamma.num_values; c = i * par->gamma.num_values;
for (j = 0; j < par->gamma.num_values; j++) for (j = 0; j < par->gamma.num_values; j++)
curves[c + j] &= gamma_par_mask[j]; curves[c + j] &= gamma_par_mask[j];
write_reg( write_reg(par, PVGAMCTRL + i,
par, PVGAMCTRL + i,
curves[c + 0], curves[c + 1], curves[c + 2], curves[c + 0], curves[c + 1], curves[c + 2],
curves[c + 3], curves[c + 4], curves[c + 5], curves[c + 3], curves[c + 4], curves[c + 5],
curves[c + 6], curves[c + 7], curves[c + 8], curves[c + 6], curves[c + 7], curves[c + 8],

10
drivers/staging/fbtft/fb_watterott.c
View File

@ -46,7 +46,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
va_end(args); va_end(args);
fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par,
par->info->device, u8, par->buf, len, "%s: ", __func__); par->info->device, u8, par->buf,
len, "%s: ", __func__);
ret = par->fbtftops.write(par, par->buf, len); ret = par->fbtftops.write(par, par->buf, len);
if (ret < 0) { if (ret < 0) {
@ -226,8 +227,8 @@ static int backlight_chip_update_status(struct backlight_device *bd)
int brightness = bd->props.brightness; int brightness = bd->props.brightness;
fbtft_par_dbg(DEBUG_BACKLIGHT, par, fbtft_par_dbg(DEBUG_BACKLIGHT, par,
"%s: brightness=%d, power=%d, fb_blank=%d\n", "%s: brightness=%d, power=%d, fb_blank=%d\n", __func__,
__func__, bd->props.brightness, bd->props.power, bd->props.brightness, bd->props.power,
bd->props.fb_blank); bd->props.fb_blank);
if (bd->props.power != FB_BLANK_UNBLANK) if (bd->props.power != FB_BLANK_UNBLANK)
@ -256,7 +257,8 @@ static void register_chip_backlight(struct fbtft_par *par)
bl_props.brightness = DEFAULT_BRIGHTNESS; bl_props.brightness = DEFAULT_BRIGHTNESS;
bd = backlight_device_register(dev_driver_string(par->info->device), bd = backlight_device_register(dev_driver_string(par->info->device),
par->info->device, par, &bl_ops, &bl_props); par->info->device, par, &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",

3
drivers/staging/fbtft/fbtft-bus.c
View File

@ -79,7 +79,8 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...)
*(((u8 *)buf) + i) = (u8)va_arg(args, unsigned int); *(((u8 *)buf) + i) = (u8)va_arg(args, unsigned int);
va_end(args); va_end(args);
fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par,
par->info->device, u8, buf, len, "%s: ", __func__); par->info->device, u8, buf, len, "%s: ",
__func__);
} }
if (len <= 0) if (len <= 0)
return; return;

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

@ -817,8 +817,8 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
info->pseudo_palette = par->pseudo_palette; info->pseudo_palette = par->pseudo_palette;
if (par->gamma.curves && gamma) { if (par->gamma.curves && gamma) {
if (fbtft_gamma_parse_str(par, if (fbtft_gamma_parse_str(par, par->gamma.curves, gamma,
par->gamma.curves, gamma, strlen(gamma))) strlen(gamma)))
goto alloc_fail; goto alloc_fail;
} }
@ -1193,7 +1193,8 @@ int fbtft_init_display(struct fbtft_par *par)
case -2: case -2:
i++; i++;
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
"init: mdelay(%d)\n", par->init_sequence[i]); "init: mdelay(%d)\n",
par->init_sequence[i]);
mdelay(par->init_sequence[i++]); mdelay(par->init_sequence[i++]);
break; break;
default: default:
@ -1321,7 +1322,8 @@ static struct fbtft_platform_data *fbtft_probe_dt(struct device *dev)
* Return: 0 if successful, negative if error * Return: 0 if successful, negative if error
*/ */
int fbtft_probe_common(struct fbtft_display *display, int fbtft_probe_common(struct fbtft_display *display,
struct spi_device *sdev, struct platform_device *pdev) struct spi_device *sdev,
struct platform_device *pdev)
{ {
struct device *dev; struct device *dev;
struct fb_info *info; struct fb_info *info;
@ -1396,7 +1398,8 @@ int fbtft_probe_common(struct fbtft_display *display,
"9-bit SPI not available, emulating using 8-bit.\n"); "9-bit SPI not available, emulating using 8-bit.\n");
/* allocate buffer with room for dc bits */ /* allocate buffer with room for dc bits */
par->extra = devm_kzalloc(par->info->device, par->extra = devm_kzalloc(par->info->device,
par->txbuf.len + (par->txbuf.len / 8) + 8, par->txbuf.len +
(par->txbuf.len / 8) + 8,
GFP_KERNEL); GFP_KERNEL);
if (!par->extra) { if (!par->extra) {
ret = -ENOMEM; ret = -ENOMEM;

3
drivers/staging/fbtft/fbtft-io.c
View File

@ -109,7 +109,8 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len)
txbuf[0] = par->startbyte | 0x3; txbuf[0] = par->startbyte | 0x3;
t.tx_buf = txbuf; t.tx_buf = txbuf;
fbtft_par_dbg_hex(DEBUG_READ, par, par->info->device, u8, fbtft_par_dbg_hex(DEBUG_READ, par, par->info->device, u8,
txbuf, len, "%s(len=%d) txbuf => ", __func__, len); txbuf, len, "%s(len=%d) txbuf => ",
__func__, len);
} }
spi_message_init(&m); spi_message_init(&m);

3
drivers/staging/fbtft/fbtft-sysfs.c
View File

@ -126,7 +126,8 @@ static ssize_t store_gamma_curve(struct device *device,
mutex_lock(&par->gamma.lock); mutex_lock(&par->gamma.lock);
memcpy(par->gamma.curves, tmp_curves, memcpy(par->gamma.curves, tmp_curves,
par->gamma.num_curves * par->gamma.num_values * sizeof(tmp_curves[0])); par->gamma.num_curves * par->gamma.num_values *
sizeof(tmp_curves[0]));
mutex_unlock(&par->gamma.lock); mutex_unlock(&par->gamma.lock);
return count; return count;

3
drivers/staging/fbtft/fbtft_device.c
View File

@ -21,7 +21,8 @@ static struct platform_device *p_device;
static char *name; static char *name;
module_param(name, charp, 0000); module_param(name, charp, 0000);
MODULE_PARM_DESC(name, "Devicename (required). name=list => list all supported devices."); MODULE_PARM_DESC(name,
"Devicename (required). name=list => list all supported devices.");
static unsigned int rotate; static unsigned int rotate;
module_param(rotate, uint, 0000); module_param(rotate, uint, 0000);

4
drivers/staging/fbtft/flexfb.c
View File

@ -694,7 +694,9 @@ static int flexfb_probe_common(struct spi_device *sdev,
} }
break; break;
default: default:
dev_err(dev, "argument 'buswidth': %d is not supported with SPI.\n", buswidth); dev_err(dev,
"argument 'buswidth': %d is not supported with SPI.\n",
buswidth);
return -EINVAL; return -EINVAL;
} }
} else { } else {