* [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases
@ 2016-02-20 1:48 Axel Lin
2016-02-20 18:11 ` Alban
2016-02-25 9:10 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2016-02-20 1:48 UTC (permalink / raw)
To: Linus Walleij; +Cc: Alban Bedel, Alexandre Courbot, linux-gpio
Move the code checking valid gpio count to cover both DT and non-DT cases.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
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));
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases
2016-02-20 1:48 [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases Axel Lin
@ 2016-02-20 18:11 ` Alban
2016-02-25 9:10 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Alban @ 2016-02-20 18:11 UTC (permalink / raw)
To: Axel Lin; +Cc: Aban Bedel, Linus Walleij, Alexandre Courbot, linux-gpio
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));
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases
2016-02-20 1:48 [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases Axel Lin
2016-02-20 18:11 ` Alban
@ 2016-02-25 9:10 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2016-02-25 9:10 UTC (permalink / raw)
To: Axel Lin; +Cc: Alban Bedel, Alexandre Courbot, linux-gpio@vger.kernel.org
On Sat, Feb 20, 2016 at 2:48 AM, 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>
Patch applied with Alban's ACK.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-25 9:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-20 1:48 [PATCH] gpio: ath79: Check valid gpio count for both DT and non-DT cases Axel Lin
2016-02-20 18:11 ` Alban
2016-02-25 9:10 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).