* [PATCH] Input: gpio_keys_polled - defer probing if GPIO probing is deferred @ 2012-12-23 8:32 Gabor Juhos 2012-12-23 10:06 ` Dmitry Torokhov 0 siblings, 1 reply; 3+ messages in thread From: Gabor Juhos @ 2012-12-23 8:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: linux-input, Alexandre Pereira da Silva, Gabor Juhos, stable If GPIO probing is deferred, the driver tries to claim an invalid GPIO line which leads to an error message like this: gpio-keys-polled buttons.2: unable to claim gpio 4294966779, err=-22 gpio-keys-polled: probe of buttons.2 failed with error -22 The patch ensures that 'gpio_keys_polled_get_devtree_pdata' returns -EPROBE_DEFER if any of the GPIOs to register are deferred. Cc: <stable@vger.kernel.org> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- drivers/input/keyboard/gpio_keys_polled.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index f686fd9..cfb54cc 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -120,6 +120,12 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct if (nbuttons == 0) return NULL; + for_each_child_of_node(node, pp) { + error = of_get_gpio(pp, 0); + if (error == -EPROBE_DEFER) + goto err_out; + } + pdata = kzalloc(sizeof(*pdata) + nbuttons * (sizeof *button), GFP_KERNEL); if (!pdata) { -- 1.7.10 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Input: gpio_keys_polled - defer probing if GPIO probing is deferred 2012-12-23 8:32 [PATCH] Input: gpio_keys_polled - defer probing if GPIO probing is deferred Gabor Juhos @ 2012-12-23 10:06 ` Dmitry Torokhov 2012-12-23 17:51 ` Gabor Juhos 0 siblings, 1 reply; 3+ messages in thread From: Dmitry Torokhov @ 2012-12-23 10:06 UTC (permalink / raw) To: Gabor Juhos; +Cc: linux-input, Alexandre Pereira da Silva, stable On Sun, Dec 23, 2012 at 09:32:03AM +0100, Gabor Juhos wrote: > If GPIO probing is deferred, the driver tries to > claim an invalid GPIO line which leads to an error > message like this: > > gpio-keys-polled buttons.2: unable to claim gpio 4294966779, err=-22 > gpio-keys-polled: probe of buttons.2 failed with error -22 > > The patch ensures that 'gpio_keys_polled_get_devtree_pdata' > returns -EPROBE_DEFER if any of the GPIOs to register are > deferred. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > --- > drivers/input/keyboard/gpio_keys_polled.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c > index f686fd9..cfb54cc 100644 > --- a/drivers/input/keyboard/gpio_keys_polled.c > +++ b/drivers/input/keyboard/gpio_keys_polled.c > @@ -120,6 +120,12 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct > if (nbuttons == 0) > return NULL; > > + for_each_child_of_node(node, pp) { > + error = of_get_gpio(pp, 0); > + if (error == -EPROBE_DEFER) > + goto err_out; > + } > + > pdata = kzalloc(sizeof(*pdata) + nbuttons * (sizeof *button), > GFP_KERNEL); > if (!pdata) { > -- Well spotted, thanks. However I think the patch should look like the one below as we should propagate all errors, not only -EPROBE_DEFER, up the stack. Thanks. -- Dmitry Input: gpio_keys_polled - defer probing if GPIO probing is deferred From: Gabor Juhos <juhosg@openwrt.org> If GPIO probing is deferred, the driver tries to claim an invalid GPIO line which leads to an error message like this: gpio-keys-polled buttons.2: unable to claim gpio 4294966779, err=-22 gpio-keys-polled: probe of buttons.2 failed with error -22 The patch ensures that error code returned by of_get_gpio_flags (including -EPROBE_DEFER) is propagated up the stack. Cc: stable@vger.kernel.org Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/keyboard/gpio_keys_polled.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index f686fd9..e75ca6b 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -135,6 +135,7 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct i = 0; for_each_child_of_node(node, pp) { + int gpio; enum of_gpio_flags flags; if (!of_find_property(pp, "gpios", NULL)) { @@ -143,9 +144,19 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct continue; } + gpio = of_get_gpio_flags(pp, 0, &flags); + if (gpio < 0) { + error = gpio; + if (error != -EPROBE_DEFER) + dev_err(dev, + "Failed to get gpio flags, error: %d\n", + error); + goto err_free_pdata; + } + button = &pdata->buttons[i++]; - button->gpio = of_get_gpio_flags(pp, 0, &flags); + button->gpio = gpio; button->active_low = flags & OF_GPIO_ACTIVE_LOW; if (of_property_read_u32(pp, "linux,code", &button->code)) { ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Input: gpio_keys_polled - defer probing if GPIO probing is deferred 2012-12-23 10:06 ` Dmitry Torokhov @ 2012-12-23 17:51 ` Gabor Juhos 0 siblings, 0 replies; 3+ messages in thread From: Gabor Juhos @ 2012-12-23 17:51 UTC (permalink / raw) To: Dmitry Torokhov; +Cc: linux-input, Alexandre Pereira da Silva, stable 2012.12.23. 11:06 keltezéssel, Dmitry Torokhov írta: > Well spotted, thanks. However I think the patch should look like the one > below as we should propagate all errors, not only -EPROBE_DEFER, up the > stack. > > Thanks. > > > Input: gpio_keys_polled - defer probing if GPIO probing is deferred > > From: Gabor Juhos <juhosg@openwrt.org> > > If GPIO probing is deferred, the driver tries to claim an invalid GPIO line > which leads to an error message like this: > > gpio-keys-polled buttons.2: unable to claim gpio 4294966779, err=-22 > gpio-keys-polled: probe of buttons.2 failed with error -22 > > The patch ensures that error code returned by of_get_gpio_flags (including > -EPROBE_DEFER) is propagated up the stack. > > Cc: stable@vger.kernel.org > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/input/keyboard/gpio_keys_polled.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c > index f686fd9..e75ca6b 100644 > --- a/drivers/input/keyboard/gpio_keys_polled.c > +++ b/drivers/input/keyboard/gpio_keys_polled.c > @@ -135,6 +135,7 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct > > i = 0; > for_each_child_of_node(node, pp) { > + int gpio; > enum of_gpio_flags flags; > > if (!of_find_property(pp, "gpios", NULL)) { > @@ -143,9 +144,19 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct > continue; > } > > + gpio = of_get_gpio_flags(pp, 0, &flags); > + if (gpio < 0) { > + error = gpio; > + if (error != -EPROBE_DEFER) > + dev_err(dev, > + "Failed to get gpio flags, error: %d\n", > + error); > + goto err_free_pdata; > + } > + > button = &pdata->buttons[i++]; > > - button->gpio = of_get_gpio_flags(pp, 0, &flags); > + button->gpio = gpio; > button->active_low = flags & OF_GPIO_ACTIVE_LOW; > > if (of_property_read_u32(pp, "linux,code", &button->code)) { Yes, this looks saner. I have replaced my patch with this, and it is working as intended. The kernel says this: platform buttons.2: Driver gpio-keys-polled requests probe deferral BTW, it seems that the gpio-keys driver needs a similar fix. -Gabor -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-23 17:51 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-23 8:32 [PATCH] Input: gpio_keys_polled - defer probing if GPIO probing is deferred Gabor Juhos 2012-12-23 10:06 ` Dmitry Torokhov 2012-12-23 17:51 ` Gabor Juhos
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).