summaryrefslogtreecommitdiff
path: root/drivers/staging/fbtft
diff options
context:
space:
mode:
authorLuis Gerhorst <linux-kernel@luisgerhorst.de>2018-01-08 11:02:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-08 16:03:45 +0100
commit17c9d1ba9a21786095abb6af5a05e206cedb280f (patch)
treedfe3a977d06d793e8f7582278e7e95fce10f9357 /drivers/staging/fbtft
parente0f1fd05af5b365d040a80eb33903a95a1fabb7f (diff)
drivers/fbtft: Remove newline after else in else-if
This removes the following warning issued by checkpatch WARNING: suspect code indent for conditional statements (8, 8) + } else + if (display->regwidth == 8 && display->buswidth == 9 && par->spi) { Signed-off-by: Luis Gerhorst <linux-kernel@luisgerhorst.de> Acked-by: Jonny Schaefer <schaefer.jonny@gmail.com> Acked-by: Alexander Wuerstlein <arw@cs.fau.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fbtft')
-rw-r--r--drivers/staging/fbtft/fbtft-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index 6d0363deba61..66b46b2c247e 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -1369,8 +1369,7 @@ int fbtft_probe_common(struct fbtft_display *display,
/* write register functions */
if (display->regwidth == 8 && display->buswidth == 8) {
par->fbtftops.write_register = fbtft_write_reg8_bus8;
- } else
- if (display->regwidth == 8 && display->buswidth == 9 && par->spi) {
+ } else if (display->regwidth == 8 && display->buswidth == 9 && par->spi) {
par->fbtftops.write_register = fbtft_write_reg8_bus9;
} else if (display->regwidth == 16 && display->buswidth == 8) {
par->fbtftops.write_register = fbtft_write_reg16_bus8;