pinctrl: max77620: Use common error handling code in max77620_pinconf_set()
* Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Replace two calls of the function "dev_err" by goto statements. * Adjust two condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
60ad481f74
commit
752caf9aca
|
@ -420,11 +420,9 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
|
||||||
MAX77620_REG_GPIO0 + pin,
|
MAX77620_REG_GPIO0 + pin,
|
||||||
MAX77620_CNFG_GPIO_DRV_MASK,
|
MAX77620_CNFG_GPIO_DRV_MASK,
|
||||||
val);
|
val);
|
||||||
if (ret < 0) {
|
if (ret)
|
||||||
dev_err(dev, "Reg 0x%02x update failed %d\n",
|
goto report_update_failure;
|
||||||
MAX77620_REG_GPIO0 + pin, ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
mpci->pin_info[pin].drv_type = val ?
|
mpci->pin_info[pin].drv_type = val ?
|
||||||
MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV;
|
MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV;
|
||||||
break;
|
break;
|
||||||
|
@ -435,11 +433,9 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
|
||||||
MAX77620_REG_GPIO0 + pin,
|
MAX77620_REG_GPIO0 + pin,
|
||||||
MAX77620_CNFG_GPIO_DRV_MASK,
|
MAX77620_CNFG_GPIO_DRV_MASK,
|
||||||
val);
|
val);
|
||||||
if (ret < 0) {
|
if (ret)
|
||||||
dev_err(dev, "Reg 0x%02x update failed %d\n",
|
goto report_update_failure;
|
||||||
MAX77620_REG_GPIO0 + pin, ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
mpci->pin_info[pin].drv_type = val ?
|
mpci->pin_info[pin].drv_type = val ?
|
||||||
MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV;
|
MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV;
|
||||||
break;
|
break;
|
||||||
|
@ -536,6 +532,11 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
report_update_failure:
|
||||||
|
dev_err(dev, "Reg 0x%02x update failed %d\n",
|
||||||
|
MAX77620_REG_GPIO0 + pin, ret);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct pinconf_ops max77620_pinconf_ops = {
|
static const struct pinconf_ops max77620_pinconf_ops = {
|
||||||
|
|
Loading…
Reference in New Issue