| Message ID | 20161111203021.3384-4-niklas.soderlund@ragnatech.se |
|---|---|
| State | New |
| Headers | show |
Hi Niklas, Thank you for the patch. On Friday 11 Nov 2016 21:30:18 Niklas Söderlund wrote: > From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > > The last else statement is missing braces and there 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> > --- > drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 2e8cc2a..6c58563 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > @@ -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,
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 2e8cc2a..6c58563 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -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,