gpio: ftgpio: Move hardware initialization
diff mbox series

Message ID 20190819082704.14237-1-linus.walleij@linaro.org
State New
Headers show
Series
  • gpio: ftgpio: Move hardware initialization
Related show

Commit Message

Linus Walleij Aug. 19, 2019, 8:27 a.m. UTC
It is probably wise to initialize the hardware before registering
the irq chip.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/gpio/gpio-ftgpio010.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Phil Reid Aug. 19, 2019, 9:02 a.m. UTC | #1
On 19/08/2019 16:27, Linus Walleij wrote:
> It is probably wise to initialize the hardware before registering
> the irq chip.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>   drivers/gpio/gpio-ftgpio010.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-ftgpio010.c b/drivers/gpio/gpio-ftgpio010.c
> index 250e71f3e688..3118d282514a 100644
> --- a/drivers/gpio/gpio-ftgpio010.c
> +++ b/drivers/gpio/gpio-ftgpio010.c
> @@ -296,10 +296,6 @@ static int ftgpio_gpio_probe(struct platform_device *pdev)
>   	girq->handler = handle_bad_irq;
>   	girq->parents[0] = irq;
>   
> -	ret = devm_gpiochip_add_data(dev, &g->gc, g);
> -	if (ret)
> -		goto dis_clk;
> -
>   	/* Disable, unmask and clear all interrupts */
>   	writel(0x0, g->base + GPIO_INT_EN);
>   	writel(0x0, g->base + GPIO_INT_MASK);
> @@ -308,6 +304,10 @@ static int ftgpio_gpio_probe(struct platform_device *pdev)
>   	/* Clear any use of debounce */
>   	writel(0x0, g->base + GPIO_DEBOUNCE_EN);
>   
> +	ret = devm_gpiochip_add_data(dev, &g->gc, g);
> +	if (ret)
> +		goto dis_clk;
> +
>   	platform_set_drvdata(pdev, g);

Should it also be after platform_set_drvdata?
But it doesn't look like it's used anywhere other than in _remove
so I guess it does't matter.


>   	dev_info(dev, "FTGPIO010 @%p registered\n", g->base);
>   
>

Patch
diff mbox series

diff --git a/drivers/gpio/gpio-ftgpio010.c b/drivers/gpio/gpio-ftgpio010.c
index 250e71f3e688..3118d282514a 100644
--- a/drivers/gpio/gpio-ftgpio010.c
+++ b/drivers/gpio/gpio-ftgpio010.c
@@ -296,10 +296,6 @@  static int ftgpio_gpio_probe(struct platform_device *pdev)
 	girq->handler = handle_bad_irq;
 	girq->parents[0] = irq;
 
-	ret = devm_gpiochip_add_data(dev, &g->gc, g);
-	if (ret)
-		goto dis_clk;
-
 	/* Disable, unmask and clear all interrupts */
 	writel(0x0, g->base + GPIO_INT_EN);
 	writel(0x0, g->base + GPIO_INT_MASK);
@@ -308,6 +304,10 @@  static int ftgpio_gpio_probe(struct platform_device *pdev)
 	/* Clear any use of debounce */
 	writel(0x0, g->base + GPIO_DEBOUNCE_EN);
 
+	ret = devm_gpiochip_add_data(dev, &g->gc, g);
+	if (ret)
+		goto dis_clk;
+
 	platform_set_drvdata(pdev, g);
 	dev_info(dev, "FTGPIO010 @%p registered\n", g->base);