From: Mark Hounschell <markh@compro.net>
Date: Fri, 25 Apr 2014 17:10:19 +0000 (-0400)
Subject: staging: dgap: remove two unnecessary conditionals
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c3b48d9b99c4a135f27b08cf3d51dfae4cf7e59;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

staging: dgap: remove two unnecessary conditionals

Remove 2 unnessessary conditionals. They are always
false in this code path.

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 2c7acee6c926..b834c83da930 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -1271,25 +1271,21 @@ static int dgap_tty_register(struct board_t *brd)
 	 */
 	tty_set_operations(brd->PrintDriver, &dgap_tty_ops);
 
-	if (!brd->dgap_Major_Serial_Registered) {
-		/* Register tty devices */
-		rc = tty_register_driver(brd->SerialDriver);
-		if (rc < 0)
-			return rc;
-		brd->dgap_Major_Serial_Registered = TRUE;
-		dgap_BoardsByMajor[brd->SerialDriver->major] = brd;
-		brd->dgap_Serial_Major = brd->SerialDriver->major;
-	}
+	/* Register tty devices */
+	rc = tty_register_driver(brd->SerialDriver);
+	if (rc < 0)
+		return rc;
+	brd->dgap_Major_Serial_Registered = TRUE;
+	dgap_BoardsByMajor[brd->SerialDriver->major] = brd;
+	brd->dgap_Serial_Major = brd->SerialDriver->major;
 
-	if (!brd->dgap_Major_TransparentPrint_Registered) {
-		/* Register Transparent Print devices */
-		rc = tty_register_driver(brd->PrintDriver);
-		if (rc < 0)
-			return rc;
-		brd->dgap_Major_TransparentPrint_Registered = TRUE;
-		dgap_BoardsByMajor[brd->PrintDriver->major] = brd;
-		brd->dgap_TransparentPrint_Major = brd->PrintDriver->major;
-	}
+	/* Register Transparent Print devices */
+	rc = tty_register_driver(brd->PrintDriver);
+	if (rc < 0)
+		return rc;
+	brd->dgap_Major_TransparentPrint_Registered = TRUE;
+	dgap_BoardsByMajor[brd->PrintDriver->major] = brd;
+	brd->dgap_TransparentPrint_Major = brd->PrintDriver->major;
 
 	return rc;
 }