64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 8d3e3f3159284dba7a86788464edd4d5cdba4f06 Mon Sep 17 00:00:00 2001
|
|
From: Sean Wang <sean.wang@mediatek.com>
|
|
Date: Wed, 10 Jan 2018 00:28:25 +0800
|
|
Subject: [PATCH 195/224] pinctrl: mediatek: mt7622: align error handling of
|
|
mtk_hw_get_value call
|
|
|
|
Make consistent error handling of all mtk_hw_get_value occurrences using
|
|
propagating error code from the internal instead of creating a new one.
|
|
|
|
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
|
|
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/mediatek/pinctrl-mt7622.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
|
|
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
|
|
@@ -1160,7 +1160,7 @@ static int mtk_pinconf_get(struct pinctr
|
|
case PIN_CONFIG_OUTPUT_ENABLE:
|
|
err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_DIR, &val);
|
|
if (err)
|
|
- return -EINVAL;
|
|
+ return err;
|
|
|
|
/* HW takes input mode as zero; output mode as non-zero */
|
|
if ((val && param == PIN_CONFIG_INPUT_ENABLE) ||
|
|
@@ -1184,11 +1184,11 @@ static int mtk_pinconf_get(struct pinctr
|
|
case PIN_CONFIG_DRIVE_STRENGTH:
|
|
err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_E4, &val);
|
|
if (err)
|
|
- return -EINVAL;
|
|
+ return err;
|
|
|
|
err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_E8, &val2);
|
|
if (err)
|
|
- return -EINVAL;
|
|
+ return err;
|
|
|
|
/* 4mA when (e8, e4) = (0, 0); 8mA when (e8, e4) = (0, 1)
|
|
* 12mA when (e8, e4) = (1, 0); 16mA when (e8, e4) = (1, 1)
|
|
@@ -1203,7 +1203,7 @@ static int mtk_pinconf_get(struct pinctr
|
|
|
|
err = mtk_hw_get_value(hw, pin, reg, &val);
|
|
if (err)
|
|
- return -EINVAL;
|
|
+ return err;
|
|
|
|
ret = val;
|
|
|