Commit 6c604d66 authored by Anton Gerasimov's avatar Anton Gerasimov Committed by Greg Kroah-Hartman

staging: fbtft: remove unnecessary line continuations

Removed unnecessary line continuations in several lines.
Signed-off-by: default avatarAnton Gerasimov <anton.gerasimov@openmailbox.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56cda8ac
...@@ -229,7 +229,7 @@ static struct fbtft_device_display displays[] = { ...@@ -229,7 +229,7 @@ static struct fbtft_device_display displays[] = {
.display = { .display = {
.buswidth = 8, .buswidth = 8,
.backlight = 1, .backlight = 1,
.fbtftops.set_addr_win = \ .fbtftops.set_addr_win =
adafruit18_green_tab_set_addr_win, adafruit18_green_tab_set_addr_win,
}, },
.bgr = true, .bgr = true,
...@@ -773,13 +773,13 @@ static struct fbtft_device_display displays[] = { ...@@ -773,13 +773,13 @@ static struct fbtft_device_display displays[] = {
{ "dc", 25 }, { "dc", 25 },
{}, {},
}, },
.gamma = "0 2 2 2 2 2 2 2 " \ .gamma = "0 2 2 2 2 2 2 2 "
"2 2 2 2 2 2 2 2 " \ "2 2 2 2 2 2 2 2 "
"2 2 2 2 2 2 2 2 " \ "2 2 2 2 2 2 2 2 "
"2 2 2 2 2 2 2 3 " \ "2 2 2 2 2 2 2 3 "
"3 3 3 3 3 3 3 3 " \ "3 3 3 3 3 3 3 3 "
"3 3 3 3 3 3 3 3 " \ "3 3 3 3 3 3 3 3 "
"3 3 3 4 4 4 4 4 " \ "3 3 3 4 4 4 4 4 "
"4 4 4 4 4 4 4" "4 4 4 4 4 4 4"
} }
} }
...@@ -893,7 +893,7 @@ static struct fbtft_device_display displays[] = { ...@@ -893,7 +893,7 @@ static struct fbtft_device_display displays[] = {
.buswidth = 16, .buswidth = 16,
.txbuflen = -2, /* disable buffer */ .txbuflen = -2, /* disable buffer */
.backlight = 1, .backlight = 1,
.fbtftops.write = \ .fbtftops.write =
fbtft_write_gpio16_wr_latched, fbtft_write_gpio16_wr_latched,
}, },
.bgr = true, .bgr = true,
...@@ -1289,7 +1289,7 @@ static int __init fbtft_device_init(void) ...@@ -1289,7 +1289,7 @@ static int __init fbtft_device_init(void)
} }
if (init_num > FBTFT_MAX_INIT_SEQUENCE) { if (init_num > FBTFT_MAX_INIT_SEQUENCE) {
pr_err(DRVNAME \ pr_err(DRVNAME
": init parameter: exceeded max array size: %d\n", ": init parameter: exceeded max array size: %d\n",
FBTFT_MAX_INIT_SEQUENCE); FBTFT_MAX_INIT_SEQUENCE);
return -EINVAL; return -EINVAL;
...@@ -1298,7 +1298,7 @@ static int __init fbtft_device_init(void) ...@@ -1298,7 +1298,7 @@ static int __init fbtft_device_init(void)
/* parse module parameter: gpios */ /* parse module parameter: gpios */
while ((p_gpio = strsep(&gpios, ","))) { while ((p_gpio = strsep(&gpios, ","))) {
if (strchr(p_gpio, ':') == NULL) { if (strchr(p_gpio, ':') == NULL) {
pr_err(DRVNAME \ pr_err(DRVNAME
": error: missing ':' in gpios parameter: %s\n", ": error: missing ':' in gpios parameter: %s\n",
p_gpio); p_gpio);
return -EINVAL; return -EINVAL;
...@@ -1306,14 +1306,14 @@ static int __init fbtft_device_init(void) ...@@ -1306,14 +1306,14 @@ static int __init fbtft_device_init(void)
p_num = p_gpio; p_num = p_gpio;
p_name = strsep(&p_num, ":"); p_name = strsep(&p_num, ":");
if (p_name == NULL || p_num == NULL) { if (p_name == NULL || p_num == NULL) {
pr_err(DRVNAME \ pr_err(DRVNAME
": something bad happened parsing gpios parameter: %s\n", ": something bad happened parsing gpios parameter: %s\n",
p_gpio); p_gpio);
return -EINVAL; return -EINVAL;
} }
ret = kstrtol(p_num, 10, &val); ret = kstrtol(p_num, 10, &val);
if (ret) { if (ret) {
pr_err(DRVNAME \ pr_err(DRVNAME
": could not parse number in gpios parameter: %s:%s\n", ": could not parse number in gpios parameter: %s:%s\n",
p_name, p_num); p_name, p_num);
return -EINVAL; return -EINVAL;
...@@ -1321,7 +1321,7 @@ static int __init fbtft_device_init(void) ...@@ -1321,7 +1321,7 @@ static int __init fbtft_device_init(void)
strcpy(fbtft_device_param_gpios[i].name, p_name); strcpy(fbtft_device_param_gpios[i].name, p_name);
fbtft_device_param_gpios[i++].gpio = (int) val; fbtft_device_param_gpios[i++].gpio = (int) val;
if (i == MAX_GPIOS) { if (i == MAX_GPIOS) {
pr_err(DRVNAME \ pr_err(DRVNAME
": gpios parameter: exceeded max array size: %d\n", ": gpios parameter: exceeded max array size: %d\n",
MAX_GPIOS); MAX_GPIOS);
return -EINVAL; return -EINVAL;
...@@ -1417,7 +1417,7 @@ static int __init fbtft_device_init(void) ...@@ -1417,7 +1417,7 @@ static int __init fbtft_device_init(void)
if (displays[i].spi) { if (displays[i].spi) {
ret = fbtft_device_spi_device_register(spi); ret = fbtft_device_spi_device_register(spi);
if (ret) { if (ret) {
pr_err(DRVNAME \ pr_err(DRVNAME
": failed to register SPI device\n"); ": failed to register SPI device\n");
return ret; return ret;
} }
...@@ -1426,7 +1426,7 @@ static int __init fbtft_device_init(void) ...@@ -1426,7 +1426,7 @@ static int __init fbtft_device_init(void)
} else { } else {
ret = platform_device_register(p_device); ret = platform_device_register(p_device);
if (ret < 0) { if (ret < 0) {
pr_err(DRVNAME \ pr_err(DRVNAME
": platform_device_register() returned %d\n", ": platform_device_register() returned %d\n",
ret); ret);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment