target/linux/mediatek/patches-4.14/0195-pinctrl-mediatek-mt7622-align-error-handling-of-mtk_.patch

   1 From 8d3e3f3159284dba7a86788464edd4d5cdba4f06 Mon Sep 17 00:00:00 2001
   2 From: Sean Wang <sean.wang@mediatek.com>
   3 Date: Wed, 10 Jan 2018 00:28:25 +0800
   4 Subject: [PATCH 195/224] pinctrl: mediatek: mt7622: align error handling of
   5  mtk_hw_get_value call
   6
   7 Make consistent error handling of all mtk_hw_get_value occurrences using
   8 propagating error code from the internal instead of creating a new one.
   9
  10 Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  11 Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
  12 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  13 ---
  14  drivers/pinctrl/mediatek/pinctrl-mt7622.c | 8 ++++----
  15  1 file changed, 4 insertions(+), 4 deletions(-)
  16
  17 diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
  18 index dc32e3c3bd73..06e8406c4440 100644
  19 --- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
  20 +++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
  21 @@ -1160,7 +1160,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,
  22         case PIN_CONFIG_OUTPUT_ENABLE:
  23                 err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_DIR, &val);
  24                 if (err)
  25 -                       return -EINVAL;
  26 +                       return err;
  27
  28                 /* HW takes input mode as zero; output mode as non-zero */
  29                 if ((val && param == PIN_CONFIG_INPUT_ENABLE) ||
  30 @@ -1184,11 +1184,11 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,
  31         case PIN_CONFIG_DRIVE_STRENGTH:
  32                 err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_E4, &val);
  33                 if (err)
  34 -                       return -EINVAL;
  35 +                       return err;
  36
  37                 err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_E8, &val2);
  38                 if (err)
  39 -                       return -EINVAL;
  40 +                       return err;
  41
  42                 /* 4mA when (e8, e4) = (0, 0); 8mA when (e8, e4) = (0, 1)
  43                  * 12mA when (e8, e4) = (1, 0); 16mA when (e8, e4) = (1, 1)
  44 @@ -1203,7 +1203,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,
  45
  46                 err = mtk_hw_get_value(hw, pin, reg, &val);
  47                 if (err)
  48 -                       return -EINVAL;
  49 +                       return err;
  50
  51                 ret = val;
  52
  53 --
  54 2.11.0
  55