[PATCH v1 3/4] platform/x86: surface3_button: Propagate error from gpiod_count()

From	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v1 3/4] platform/x86: surface3_button: Propagate error from gpiod_count()
Date	2017-02-20 17:20 +0100
Message-ID	<tcYQW-6Uz-5@gated-at.bofh.it> (permalink)
References	<tcYQW-6Uz-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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(-)

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);
-- 
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v1 3/4] platform/x86: surface3_button: Propagate error from gpiod_count() Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-02-20 17:20 +0100

csiph-web