pinctrl: sh-pfc: r8a7795: Simplify get bias logic
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Sat, 12 Nov 2016 16:04:26 +0000 (17:04 +0100)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 16 Nov 2016 09:28:58 +0000 (10:28 +0100)
The last else statement is missing braces, and the indentation level can
be reduced.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
drivers/pinctrl/sh-pfc/pfc-r8a7795.c

index 2e8cc2a..6c58563 100644 (file)
@@ -5367,13 +5367,12 @@ static unsigned int r8a7795_pinmux_get_bias(struct sh_pfc *pfc,
        reg = pullups[pin].reg;
        bit = BIT(pullups[pin].bit);
 
-       if (sh_pfc_read_reg(pfc, PUEN + reg, 32) & bit) {
-               if (sh_pfc_read_reg(pfc, PUD + reg, 32) & bit)
-                       return PIN_CONFIG_BIAS_PULL_UP;
-               else
-                       return PIN_CONFIG_BIAS_PULL_DOWN;
-       } else
+       if (!(sh_pfc_read_reg(pfc, PUEN + reg, 32) & bit))
                return PIN_CONFIG_BIAS_DISABLE;
+       else if (sh_pfc_read_reg(pfc, PUD + reg, 32) & bit)
+               return PIN_CONFIG_BIAS_PULL_UP;
+       else
+               return PIN_CONFIG_BIAS_PULL_DOWN;
 }
 
 static void r8a7795_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,