* [PATCH 1/2] pinctrl: stm32: fix warning
2016-05-12 14:46 [PATCH 0/2] pinctrl: stm32: .pin_config_dbg_show fixes patrice.chotard
@ 2016-05-12 14:46 ` patrice.chotard
2016-05-12 14:46 ` [PATCH 2/2] pinctrl: stm32: factorize stm32_pconf_input/output_get() patrice.chotard
2016-05-24 11:04 ` [PATCH 0/2] pinctrl: stm32: .pin_config_dbg_show fixes Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: patrice.chotard @ 2016-05-12 14:46 UTC (permalink / raw)
To: linux-kernel, Linus Walleij, linux-arm-kernel, Maxime Coquelin
Cc: patrice.chotard
From: Patrice Chotard <patrice.chotard@st.com>
fix compilation warning :
drivers/pinctrl/stm32/pinctrl-stm32.c:823:7: warning: too many arguments for format [-Wformat-extra-args]
speeds[speed], "speed");
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
drivers/pinctrl/stm32/pinctrl-stm32.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 1527740..249da52 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -806,21 +806,21 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
drive = stm32_pconf_get_driving(bank, offset);
speed = stm32_pconf_get_speed(bank, offset);
val = stm32_pconf_output_get(bank, offset);
- seq_printf(s, "- %s - %s - %s - %s %s",
+ seq_printf(s, "- %s - %s - %s - %s speed",
val ? "high" : "low",
drive ? "open drain" : "push pull",
biasing[bias],
- speeds[speed], "speed");
+ speeds[speed]);
break;
/* alternate */
case 2:
drive = stm32_pconf_get_driving(bank, offset);
speed = stm32_pconf_get_speed(bank, offset);
- seq_printf(s, "%d - %s -%s", alt,
+ seq_printf(s, "%d - %s -%s - %s speed", alt,
drive ? "open drain" : "push pull",
biasing[bias],
- speeds[speed], "speed");
+ speeds[speed]);
break;
/* analog */
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] pinctrl: stm32: factorize stm32_pconf_input/output_get()
2016-05-12 14:46 [PATCH 0/2] pinctrl: stm32: .pin_config_dbg_show fixes patrice.chotard
2016-05-12 14:46 ` [PATCH 1/2] pinctrl: stm32: fix warning patrice.chotard
@ 2016-05-12 14:46 ` patrice.chotard
2016-05-24 11:04 ` [PATCH 0/2] pinctrl: stm32: .pin_config_dbg_show fixes Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: patrice.chotard @ 2016-05-12 14:46 UTC (permalink / raw)
To: linux-kernel, Linus Walleij, linux-arm-kernel, Maxime Coquelin
Cc: patrice.chotard
From: Patrice Chotard <patrice.chotard@st.com>
As these 2 functions code are 95% similar, factorize them.
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
drivers/pinctrl/stm32/pinctrl-stm32.c | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 249da52..8b82d3e 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -661,8 +661,8 @@ static u32 stm32_pconf_get_bias(struct stm32_gpio_bank *bank,
return (val >> (offset * 2));
}
-static bool stm32_pconf_input_get(struct stm32_gpio_bank *bank,
- unsigned int offset)
+static bool stm32_pconf_get(struct stm32_gpio_bank *bank,
+ unsigned int offset, bool dir)
{
unsigned long flags;
u32 val;
@@ -670,23 +670,12 @@ static bool stm32_pconf_input_get(struct stm32_gpio_bank *bank,
clk_enable(bank->clk);
spin_lock_irqsave(&bank->lock, flags);
- val = !!(readl_relaxed(bank->base + STM32_GPIO_IDR) & BIT(offset));
-
- spin_unlock_irqrestore(&bank->lock, flags);
- clk_disable(bank->clk);
-
- return val;
-}
-
-static bool stm32_pconf_output_get(struct stm32_gpio_bank *bank,
- unsigned int offset)
-{
- unsigned long flags;
- u32 val;
-
- clk_enable(bank->clk);
- spin_lock_irqsave(&bank->lock, flags);
- val = !!(readl_relaxed(bank->base + STM32_GPIO_ODR) & BIT(offset));
+ if (dir)
+ val = !!(readl_relaxed(bank->base + STM32_GPIO_IDR) &
+ BIT(offset));
+ else
+ val = !!(readl_relaxed(bank->base + STM32_GPIO_ODR) &
+ BIT(offset));
spin_unlock_irqrestore(&bank->lock, flags);
clk_disable(bank->clk);
@@ -795,7 +784,7 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
switch (mode) {
/* input */
case 0:
- val = stm32_pconf_input_get(bank, offset);
+ val = stm32_pconf_get(bank, offset, true);
seq_printf(s, "- %s - %s",
val ? "high" : "low",
biasing[bias]);
@@ -805,7 +794,7 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
case 1:
drive = stm32_pconf_get_driving(bank, offset);
speed = stm32_pconf_get_speed(bank, offset);
- val = stm32_pconf_output_get(bank, offset);
+ val = stm32_pconf_get(bank, offset, false);
seq_printf(s, "- %s - %s - %s - %s speed",
val ? "high" : "low",
drive ? "open drain" : "push pull",
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread