queue-5.4/pinctrl-mediatek-remove-shadow-variable-declaration.patch

   1 From b18ecdce0189e59f3d4c1492339485f7ba48b4ea Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Tue, 7 Apr 2020 18:33:52 +0800
   4 Subject: pinctrl: mediatek: remove shadow variable declaration
   5
   6 From: Light Hsieh <light.hsieh@mediatek.com>
   7
   8 [ Upstream commit d1f7af4b4a11bcd85a18b383cb6fae1915916a83 ]
   9
  10 Remove shadow declaration of variable 'pullup' in mtk_pinconf_get()
  11
  12 Signed-off-by: Light Hsieh <light.hsieh@mediatek.com>
  13 Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
  14 Link: https://lore.kernel.org/r/1586255632-27528-1-git-send-email-light.hsieh@mediatek.com
  15 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  16 Stable-dep-of: c5d3b64c568a ("pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE")
  17 Signed-off-by: Sasha Levin <sashal@kernel.org>
  18 ---
  19  drivers/pinctrl/mediatek/pinctrl-paris.c | 2 --
  20  1 file changed, 2 deletions(-)
  21
  22 diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
  23 index 18706c46d46ba..b613dda50151b 100644
  24 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c
  25 +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
  26 @@ -164,8 +164,6 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,
  27         case MTK_PIN_CONFIG_PU_ADV:
  28         case MTK_PIN_CONFIG_PD_ADV:
  29                 if (hw->soc->adv_pull_get) {
  30 -                       bool pullup;
  31 -
  32                         pullup = param == MTK_PIN_CONFIG_PU_ADV;
  33                         err = hw->soc->adv_pull_get(hw, desc, pullup, &ret);
  34                 } else
  35 --
  36 2.43.0
  37