From: Luis Gerhorst <linux-kernel@luisgerhorst.de>
Date: Mon, 8 Jan 2018 10:02:47 +0000 (+0100)
Subject: drivers/fbtft: Remove newline after else in else-if
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=17c9d1ba9a21786095abb6af5a05e206cedb280f;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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;