ODROID C1/C2: Optimize I2C check code

Change-Id: I13d4273b8eeee055bde280cd1a25ba6e82b38f28
hardkernel · Sep 4, 2018 · 175d1f6 · 175d1f6
1 parent eb609f8
commit 175d1f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/wiringPi/odroidc1.c b/wiringPi/odroidc1.c
@@ -247,10 +247,12 @@ static int getModeToGpio (int mode, int pin)
 	}
 
 	/* To check I2C module loaded */
-	if (moduleLoaded(AML_MODULE_I2C) && (retPin == 74 || retPin == 75))
-		return -1;
-	else
-		return retPin;
+	if (retPin == 74 || retPin == 75) {
+		if (moduleLoaded(AML_MODULE_I2C))
+			return -1;
+	}
+
+	return retPin;
 }
 
 /*----------------------------------------------------------------------------*/

diff --git a/wiringPi/odroidc2.c b/wiringPi/odroidc2.c
@@ -302,10 +302,12 @@ static int getModeToGpio (int mode, int pin)
 	}
 
 	/* To check I2C module loaded */
-	if (moduleLoaded(AML_MODULE_I2C) && (retPin == 205 || retPin == 206))
-		return -1;
-	else
-		return retPin;
+	if (retPin == 205 || retPin == 206) {
+		if (moduleLoaded(AML_MODULE_I2C))
+			return -1;
+	}
+
+	return retPin;
 }
 
 /*----------------------------------------------------------------------------*/