* [PATCH v2 2/2] gpio: moxart: Avoid forward declaration
2014-03-25 2:28 [PATCH v2 1/2] gpio: moxart: Actually set output state in moxart_gpio_direction_output() Axel Lin
@ 2014-03-25 2:29 ` Axel Lin
2014-03-25 2:35 ` [PATCH v2 1/2] gpio: moxart: Actually set output state in moxart_gpio_direction_output() Alexandre Courbot
1 sibling, 0 replies; 3+ messages in thread
From: Axel Lin @ 2014-03-25 2:29 UTC (permalink / raw)
To: Linus Walleij; +Cc: Alexandre Courbot, Jonas Jensen, linux-gpio
Slightly adjust the code to avoid forward declaration.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/gpio/gpio-moxart.c | 43 ++++++++++++++++++++-----------------------
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index 4bd81f9..ccd4570 100644
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -33,8 +33,6 @@ struct moxart_gpio_chip {
void __iomem *base;
};
-static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value);
-
static inline struct moxart_gpio_chip *to_moxart_gpio(struct gpio_chip *chip)
{
return container_of(chip, struct moxart_gpio_chip, gpio);
@@ -50,26 +48,6 @@ static void moxart_gpio_free(struct gpio_chip *chip, unsigned offset)
pinctrl_free_gpio(offset);
}
-static int moxart_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-{
- struct moxart_gpio_chip *gc = to_moxart_gpio(chip);
- void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION;
-
- writel(readl(ioaddr) & ~BIT(offset), ioaddr);
- return 0;
-}
-
-static int moxart_gpio_direction_output(struct gpio_chip *chip,
- unsigned offset, int value)
-{
- struct moxart_gpio_chip *gc = to_moxart_gpio(chip);
- void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION;
-
- moxart_gpio_set(chip, offset, value);
- writel(readl(ioaddr) | BIT(offset), ioaddr);
- return 0;
-}
-
static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{
struct moxart_gpio_chip *gc = to_moxart_gpio(chip);
@@ -81,7 +59,6 @@ static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
else
reg = reg & ~BIT(offset);
-
writel(reg, ioaddr);
}
@@ -96,6 +73,26 @@ static int moxart_gpio_get(struct gpio_chip *chip, unsigned offset)
return !!(readl(gc->base + GPIO_DATA_IN) & BIT(offset));
}
+static int moxart_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+{
+ struct moxart_gpio_chip *gc = to_moxart_gpio(chip);
+ void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION;
+
+ writel(readl(ioaddr) & ~BIT(offset), ioaddr);
+ return 0;
+}
+
+static int moxart_gpio_direction_output(struct gpio_chip *chip,
+ unsigned offset, int value)
+{
+ struct moxart_gpio_chip *gc = to_moxart_gpio(chip);
+ void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION;
+
+ moxart_gpio_set(chip, offset, value);
+ writel(readl(ioaddr) | BIT(offset), ioaddr);
+ return 0;
+}
+
static struct gpio_chip moxart_template_chip = {
.label = "moxart-gpio",
.request = moxart_gpio_request,
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/2] gpio: moxart: Actually set output state in moxart_gpio_direction_output()
2014-03-25 2:28 [PATCH v2 1/2] gpio: moxart: Actually set output state in moxart_gpio_direction_output() Axel Lin
2014-03-25 2:29 ` [PATCH v2 2/2] gpio: moxart: Avoid forward declaration Axel Lin
@ 2014-03-25 2:35 ` Alexandre Courbot
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Courbot @ 2014-03-25 2:35 UTC (permalink / raw)
To: Axel Lin; +Cc: Linus Walleij, Jonas Jensen, linux-gpio@vger.kernel.org
On Tue, Mar 25, 2014 at 11:28 AM, Axel Lin <axel.lin@ingics.com> wrote:
> moxart_gpio_direction_output() ignored the state passed into it. Fix it.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> drivers/gpio/gpio-moxart.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
> index 2af9900..4bd81f9 100644
> --- a/drivers/gpio/gpio-moxart.c
> +++ b/drivers/gpio/gpio-moxart.c
> @@ -33,6 +33,8 @@ struct moxart_gpio_chip {
> void __iomem *base;
> };
>
> +static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value);
Just reverse the order of your patches, and you don't have to make
this declaration at all.
It makes little sense to introduce a forward-declaration in a patch
and remove it in the very next.
^ permalink raw reply [flat|nested] 3+ messages in thread