Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm / mach-pxa / corgi_pm.c

diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 7a39efc..c71c483 100644 (file)
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -27,7 +27,7 @@
 
 #include <mach/corgi.h>
 #include <mach/pxa2xx-regs.h>
-#include <mach/sharpsl_pm.h>
+#include "sharpsl_pm.h"
 
 #include "generic.h"
 
@@ -131,16 +131,11 @@ static int corgi_should_wakeup(unsigned int resume_on_alarm)
        return is_resume;
 }
 
-static unsigned long corgi_charger_wakeup(void)
+static bool corgi_charger_wakeup(void)
 {
-       unsigned long ret;
-
-       ret = (!gpio_get_value(CORGI_GPIO_AC_IN) << GPIO_bit(CORGI_GPIO_AC_IN))
-               | (!gpio_get_value(CORGI_GPIO_KEY_INT)
-               << GPIO_bit(CORGI_GPIO_KEY_INT))
-               | (!gpio_get_value(CORGI_GPIO_WAKEUP)
-               << GPIO_bit(CORGI_GPIO_WAKEUP));
-       return ret;
+       return !gpio_get_value(CORGI_GPIO_AC_IN) ||
+               !gpio_get_value(CORGI_GPIO_KEY_INT) ||
+               !gpio_get_value(CORGI_GPIO_WAKEUP);
 }
 
 unsigned long corgipm_read_devdata(int type)