| From a5e2a7af9e83a53bbd5f72c4fe34508e95abc3aa Mon Sep 17 00:00:00 2001 |
| From: Amelie Delaunay <amelie.delaunay@st.com> |
| Date: Wed, 22 Apr 2020 09:25:13 +0200 |
| Subject: [PATCH] pinctrl: stmfx: stmfx_pinconf_set doesn't require to get |
| direction anymore |
| |
| commit 36126f5309b5054c2a57f7c603a6f8da1f4800d4 upstream. |
| |
| Pin direction is not used to set pin configuration. |
| |
| Fixes: a502b343ebd0 ("pinctrl: stmfx: update pinconf settings") |
| Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> |
| Link: https://lore.kernel.org/r/20200422072513.8352-1-amelie.delaunay@st.com |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c |
| index fe734135b0f2..0ca62a96a829 100644 |
| --- a/drivers/pinctrl/pinctrl-stmfx.c |
| +++ b/drivers/pinctrl/pinctrl-stmfx.c |
| @@ -277,7 +277,7 @@ static int stmfx_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, |
| struct pinctrl_gpio_range *range; |
| enum pin_config_param param; |
| u32 arg; |
| - int dir, i, ret; |
| + int i, ret; |
| |
| range = pinctrl_find_gpio_range_from_pin_nolock(pctldev, pin); |
| if (!range) { |
| @@ -285,10 +285,6 @@ static int stmfx_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, |
| return -EINVAL; |
| } |
| |
| - dir = stmfx_gpio_get_direction(&pctl->gpio_chip, pin); |
| - if (dir < 0) |
| - return dir; |
| - |
| for (i = 0; i < num_configs; i++) { |
| param = pinconf_to_config_param(configs[i]); |
| arg = pinconf_to_config_argument(configs[i]); |
| -- |
| 2.7.4 |
| |
