kernel: bump 4.14 to 4.14.125 (FS#2305 FS#2297)
[oweals/openwrt.git] / 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 --- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
18 +++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
19 @@ -1160,7 +1160,7 @@ static int mtk_pinconf_get(struct pinctr
20         case PIN_CONFIG_OUTPUT_ENABLE:
21                 err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_DIR, &val);
22                 if (err)
23 -                       return -EINVAL;
24 +                       return err;
25  
26                 /* HW takes input mode as zero; output mode as non-zero */
27                 if ((val && param == PIN_CONFIG_INPUT_ENABLE) ||
28 @@ -1184,11 +1184,11 @@ static int mtk_pinconf_get(struct pinctr
29         case PIN_CONFIG_DRIVE_STRENGTH:
30                 err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_E4, &val);
31                 if (err)
32 -                       return -EINVAL;
33 +                       return err;
34  
35                 err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_E8, &val2);
36                 if (err)
37 -                       return -EINVAL;
38 +                       return err;
39  
40                 /* 4mA when (e8, e4) = (0, 0); 8mA when (e8, e4) = (0, 1)
41                  * 12mA when (e8, e4) = (1, 0); 16mA when (e8, e4) = (1, 1)
42 @@ -1203,7 +1203,7 @@ static int mtk_pinconf_get(struct pinctr
43  
44                 err = mtk_hw_get_value(hw, pin, reg, &val);
45                 if (err)
46 -                       return -EINVAL;
47 +                       return err;
48  
49                 ret = val;
50