Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1679581

[PATCH] staging: sm750fb: coordinate conditional compilation

Show all headers | View raw

coordinate conditional compilation with g_dcftSupportedDviController[]

fix exceed-80-characters issue

Signed-off-by: Lynn Lei <lynnl.wit@gmail.com>
---
 drivers/staging/sm750fb/ddk750_dvi.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c
index 171ae063f06f..c4f329c2f1ed 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -42,14 +42,19 @@ int dviInit(
 	unsigned char pllFilterValue
 			)
 {
+#ifdef DVI_CTRL_SII164
 	dvi_ctrl_device_t *pCurrentDviCtrl;
 
 	pCurrentDviCtrl = g_dcftSupportedDviController;
-	if (pCurrentDviCtrl->pfnInit) {
-		return pCurrentDviCtrl->pfnInit(edgeSelect, busSelect, dualEdgeClkSelect, hsyncEnable,
-						vsyncEnable, deskewEnable, deskewSetting, continuousSyncEnable,
-						pllFilterEnable, pllFilterValue);
-	}
+
+	return pCurrentDviCtrl->pfnInit(
+		edgeSelect, busSelect, dualEdgeClkSelect,
+		hsyncEnable, vsyncEnable, deskewEnable,
+		deskewSetting, continuousSyncEnable,
+		pllFilterEnable, pllFilterValue
+	);
+#endif
+
 	return -1; /* error */
 }
 
-- 
2.13.2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] staging: sm750fb: coordinate conditional compilation Lynn Lei <lynnl.wit@gmail.com> - 2017-07-03 01:20 +0200

csiph-web