duplication in if ... else if branches

PATCH New Roel Kluin 1 participant 1 message Feb 10, 2008

Subsystems (3)

Arm (32-bit) Arm sub-architectures I2C subsystem host drivers

lore

Share & tools

lore

Roel Kluin

author

2008-02-10 15:11 UTC #0 lore raw

PATCH 1/1 duplication in if ... else if branches

There is a duplication of code in the following section. Possibly it was copy-pasted and it was forgotten to edit these lines? otherwise consider removing the duplicate lines with the patch below.
---
Different if ... else if branches do the same, remove duplication

Signed-off-by Roel Kluin <[email protected]>

---

arch/arm/mach-pnx4008/gpio.c +1 -6

index 1ab84ce..7a3b190 100644
@@ -122,16 +122,11 @@ int pnx4008_gpio_register_pin(unsigned short pin)
 	unsigned long bit = GPIO_BIT(pin);
 	int ret = -EBUSY;	/* Already in use */
 
 	gpio_lock();
 
-	if (GPIO_ISBID(pin)) {
-		if (access_map[GPIO_INDEX] & bit)
-			goto out;
-		access_map[GPIO_INDEX] |= bit;
-
-	} else if (GPIO_ISRAM(pin)) {
+	if (GPIO_ISBID(pin) || GPIO_ISRAM(pin)) {
 		if (access_map[GPIO_INDEX] & bit)
 			goto out;
 		access_map[GPIO_INDEX] |= bit;
 
 	} else if (GPIO_ISMUX(pin)) {