| Message ID | 20170220161549.39490-5-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 20, 2017 at 06:15:49PM +0200, Andy Shevchenko wrote: > Since gpiod_count() does not return 0 anymore, we don't need to shadow > its error code and would safely propagate to the user. > > While here, replace second parameter by NULL in order to prevent side > effects on _DSD enabled firmware. > > Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/input/misc/soc_button_array.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c > index ddb2f22fca7a..c3b8e1fb4699 100644 > --- a/drivers/input/misc/soc_button_array.c > +++ b/drivers/input/misc/soc_button_array.c > @@ -169,9 +169,10 @@ static int soc_button_probe(struct platform_device *pdev) > > button_info = (struct soc_button_info *)id->driver_data; > > - if (gpiod_count(dev, KBUILD_MODNAME) <= 0) { > + error = gpiod_count(dev, NULL); > + if (error < 0) { > dev_dbg(dev, "no GPIO attached, ignoring...\n"); > - return -ENODEV; > + return error; > } > > priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > -- > 2.11.0 >
On Mon, Feb 20, 2017 at 5:15 PM, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Since gpiod_count() does not return 0 anymore, we don't need to shadow > its error code and would safely propagate to the user. > > While here, replace second parameter by NULL in order to prevent side > effects on _DSD enabled firmware. > > Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Patch applied with Dmitry's ACK. Yours, Linus Walleij -- 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
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index ddb2f22fca7a..c3b8e1fb4699 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -169,9 +169,10 @@ static int soc_button_probe(struct platform_device *pdev) button_info = (struct soc_button_info *)id->driver_data; - if (gpiod_count(dev, KBUILD_MODNAME) <= 0) { + error = gpiod_count(dev, NULL); + if (error < 0) { dev_dbg(dev, "no GPIO attached, ignoring...\n"); - return -ENODEV; + return error; } priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
Since gpiod_count() does not return 0 anymore, we don't need to shadow its error code and would safely propagate to the user. While here, replace second parameter by NULL in order to prevent side effects on _DSD enabled firmware. Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/input/misc/soc_button_array.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)