Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e8dbad authored by Axel Lin's avatar Axel Lin Committed by Linus Walleij
Browse files

gpio: moxart: Avoid forward declaration 



Slightly adjust the code to avoid forward declaration as we need to call
moxart_gpio_set() in moxart_gpio_direction_output() to properly set the
output state.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a585f87c

drivers/gpio/gpio-moxart.c

+19 −20
Original line number Diff line number Diff line
@@ -48,25 +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;



	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);
@@ -78,7 +59,6 @@ static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
	else

		reg = reg & ~BIT(offset);





	writel(reg, ioaddr);

}
@@ -93,6 +73,25 @@ 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;



	writel(readl(ioaddr) | BIT(offset), ioaddr);

	return 0;

}



static struct gpio_chip moxart_template_chip = {

	.label			= "moxart-gpio",

	.request		= moxart_gpio_request,