From: John Crispin <john@openwrt.org>
Date: Thu, 1 Aug 2013 14:31:24 +0000 (+0000)
Subject: gpio-button-hotplug: use gpio_button_get_value() to fetch state.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ef964229202bd9afdf8aaa7bc60bba1d8e401531;p=openwrt%2Fstaging%2Frobimarko.git

gpio-button-hotplug: use gpio_button_get_value() to fetch state.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

SVN-Revision: 37642
---

diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 7fe169067d..9cbee21e0a 100644
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -288,10 +288,7 @@ static void gpio_keys_polled_check_state(struct gpio_keys_button *button,
 {
 	int state;
 
-	if (bdata->can_sleep)
-		state = !!gpio_get_value_cansleep(button->gpio);
-	else
-		state = !!gpio_get_value(button->gpio);
+	state = gpio_button_get_value(button, bdata);
 
 	state = !!(state ^ button->active_low);
 	if (state != bdata->last_state) {