From 5de28e462b688ba9ac98d318703f63dde7566c72 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Wed, 6 Sep 2017 16:02:56 +0800 Subject: [PATCH] MLK-17491-10 pinctrl: imx: remove gpio_set_direction_scu There's no meaning to add gpio_set_direction-scu function as 1) current pinctrl binding does not claim any GPIO direction setting capbility and 2) no GPIO driver actually uses it. And current implementation also simply return a -EINVAL error which is meainingless too. Cc: Anson Huang Reviewed-by: Peng Fan Fixes: 5d7a13220ade ("MLK-15128-3 pinctrl: freescale: support scu and memmap pinctrl together") Signed-off-by: Dong Aisheng --- drivers/pinctrl/freescale/pinctrl-imx.c | 6 ++---- drivers/pinctrl/freescale/pinctrl-imx.h | 7 ------- drivers/pinctrl/freescale/pinctrl-scu.c | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 565b27f81553..41574d9a432f 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -250,12 +250,10 @@ static int imx_pmx_gpio_set_direction(struct pinctrl_dev *pctldev, struct imx_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev); const struct imx_pinctrl_soc_info *info = ipctl->info; - if (info->flags & IMX8_USE_SCU) - return imx_pmx_backend_gpio_set_direction_scu(pctldev, - range, offset, input); - else + if (!(info->flags & IMX8_USE_SCU)) return imx_pmx_backend_gpio_set_direction_mem(pctldev, range, offset, input); + return 0; } static const struct pinmux_ops imx_pmx_ops = { diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h index ea17d8b5fef7..80af4f65e92f 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.h +++ b/drivers/pinctrl/freescale/pinctrl-imx.h @@ -178,8 +178,6 @@ static inline int imx_pinctrl_parse_pin_mem(struct imx_pinctrl_soc_info *info, #ifdef CONFIG_PINCTRL_IMX_SCU int imx_pmx_set_one_pin_scu(struct imx_pinctrl *ipctl, struct imx_pin *pin); -int imx_pmx_backend_gpio_set_direction_scu(struct pinctrl_dev *pctldev, - struct pinctrl_gpio_range *range, unsigned offset, bool input); int imx_pinconf_backend_get_scu(struct pinctrl_dev *pctldev, unsigned pin_id, unsigned long *config); int imx_pinconf_backend_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id, @@ -191,11 +189,6 @@ static inline int imx_pmx_set_one_pin_scu(struct imx_pinctrl *ipctl, struct imx_ { return 0; } -static inline int imx_pmx_backend_gpio_set_direction_scu(struct pinctrl_dev *pctldev, - struct pinctrl_gpio_range *range, unsigned offset, bool input) -{ - return 0; -} static inline int imx_pinconf_backend_get_scu(struct pinctrl_dev *pctldev, unsigned pin_id, unsigned long *config) { diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c b/drivers/pinctrl/freescale/pinctrl-scu.c index b3667d033cbb..79e987c6577c 100644 --- a/drivers/pinctrl/freescale/pinctrl-scu.c +++ b/drivers/pinctrl/freescale/pinctrl-scu.c @@ -36,12 +36,6 @@ int imx_pmx_set_one_pin_scu(struct imx_pinctrl *ipctl, struct imx_pin *pin) return 0; } -int imx_pmx_backend_gpio_set_direction_scu(struct pinctrl_dev *pctldev, - struct pinctrl_gpio_range *range, unsigned offset, bool input) -{ - return -EINVAL; -} - int imx_pinconf_backend_get_scu(struct pinctrl_dev *pctldev, unsigned pin_id, unsigned long *config) { -- 2.17.1