[RESEND PATCH] mfd: stmpe: honor gpio interrupt probe deferral

[RESEND PATCH] mfd: stmpe: honor gpio interrupt probe deferral

[Marcel Ziswiler]

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Actually honor probe deferral in trying to get the GPIO interrupt as
of_get_named_gpio_flags() in stmpe_of_probe() may as well just do so.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

 drivers/mfd/stmpe.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 566caca4efd8..4d6ffd3ef398 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1331,6 +1331,8 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)
 		return -ENOMEM;
 
 	stmpe_of_probe(pdata, np);
+	if (-EPROBE_DEFER == pdata->irq_gpio)
+		return -EPROBE_DEFER;
 
 	if (of_find_property(np, "interrupts", NULL) == NULL)
 		ci->irq = -1;
-- 
2.14.4

Re: [RESEND PATCH] mfd: stmpe: honor gpio interrupt probe deferral

[Lee Jones]

On Tue, 14 Aug 2018, Marcel Ziswiler wrote:

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Actually honor probe deferral in trying to get the GPIO interrupt as
> of_get_named_gpio_flags() in stmpe_of_probe() may as well just do so.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> ---
> 
>  drivers/mfd/stmpe.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
> index 566caca4efd8..4d6ffd3ef398 100644
> --- a/drivers/mfd/stmpe.c
> +++ b/drivers/mfd/stmpe.c
> @@ -1331,6 +1331,8 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)
>  		return -ENOMEM;
>  
>  	stmpe_of_probe(pdata, np);
> +	if (-EPROBE_DEFER == pdata->irq_gpio)
> +		return -EPROBE_DEFER;

EPROBE_DEFER usually means "stop what you're doing and return", rather
than "do a few more things, then return".  With that in mind, I would
rather you convert stmpe_of_probe() to return and int containing the
appropriate error as soon as it is detected.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog