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>

1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/pinctrl/pinctrl-max77620.c b/drivers/pinctrl/pinctrl-max77620.c
index b8d2180a2bea..a7f37063518e 100644
--- a/drivers/pinctrl/pinctrl-max77620.c
+++ b/drivers/pinctrl/pinctrl-max77620.c
@@ -420,11 +420,9 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
                                                  MAX77620_REG_GPIO0 + pin,
                                                  MAX77620_CNFG_GPIO_DRV_MASK,
                                                  val);
-                        if (ret < 0) {
-                                dev_err(dev, "Reg 0x%02x update failed %d\n",
-                                        MAX77620_REG_GPIO0 + pin, ret);
-                                return ret;
-                        }
+                        if (ret)
+                                goto report_update_failure;
+
                         mpci->pin_info[pin].drv_type = val ?
                                 MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV;
                         break;
@@ -435,11 +433,9 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
                                                  MAX77620_REG_GPIO0 + pin,
                                                  MAX77620_CNFG_GPIO_DRV_MASK,
                                                  val);
-                        if (ret < 0) {
-                                dev_err(dev, "Reg 0x%02x update failed %d\n",
-                                        MAX77620_REG_GPIO0 + pin, ret);
-                                return ret;
-                        }
+                        if (ret)
+                                goto report_update_failure;
+
                         mpci->pin_info[pin].drv_type = val ?
                                 MAX77620_PIN_PP_DRV : MAX77620_PIN_OD_DRV;
                         break;
@@ -536,6 +532,11 @@ static int max77620_pinconf_set(struct pinctrl_dev *pctldev,
         }
 
         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 = {