| Message ID | 20170220161549.39490-4-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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> As I understand it Andy, you're more or less default-maintainer for drivers/platform/x86 so I can just merge this patch into the GPIO tree with the rest? 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
On Tue, 2017-03-14 at 10:46 +0100, Linus Walleij wrote: > 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> > > As I understand it Andy, you're more or less default-maintainer for > drivers/platform/x86 so I can just merge this patch into the > GPIO tree with the rest? Correct!
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 to the GPIO tree. 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/platform/x86/surface3_button.c b/drivers/platform/x86/surface3_button.c index 8bfd7f613d36..57f51476bb65 100644 --- a/drivers/platform/x86/surface3_button.c +++ b/drivers/platform/x86/surface3_button.c @@ -196,9 +196,10 @@ static int surface3_button_probe(struct i2c_client *client, strlen(SURFACE_BUTTON_OBJ_NAME))) return -ENODEV; - 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/platform/x86/surface3_button.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)