Re: [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases

[Alban <albeu@free.fr>]

On Sat, 20 Feb 2016 09:48:07 +0800
Axel Lin <axel.lin@ingics.com> wrote:

> Move the code checking valid gpio count to cover both DT and non-DT cases.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Acked-by: Aban Bedel <albeu@free.fr>

> ---
>  drivers/gpio/gpio-ath79.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
> index 018ea9d..c4f4cdd 100644
> --- a/drivers/gpio/gpio-ath79.c
> +++ b/drivers/gpio/gpio-ath79.c
> @@ -240,10 +240,6 @@ static int ath79_gpio_probe(struct platform_device *pdev)
>  			dev_err(&pdev->dev, "ngpios property is not valid\n");
>  			return err;
>  		}
> -		if (ath79_gpio_count >= 32) {
> -			dev_err(&pdev->dev, "ngpios must be less than 32\n");
> -			return -EINVAL;
> -		}
>  		oe_inverted = of_device_is_compatible(np, "qca,ar9340-gpio");
>  	} else if (pdata) {
>  		ath79_gpio_count = pdata->ngpios;
> @@ -253,6 +249,11 @@ static int ath79_gpio_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> +	if (ath79_gpio_count >= 32) {
> +		dev_err(&pdev->dev, "ngpios must be less than 32\n");
> +		return -EINVAL;
> +	}
> +
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	ctrl->base = devm_ioremap_nocache(
>  		&pdev->dev, res->start, resource_size(res));