Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

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

diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index ea9f903..4e64a14 100644 (file)
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -165,13 +165,10 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm)
        return is_resume;
 }
 
-static unsigned long spitz_charger_wakeup(void)
+static bool spitz_charger_wakeup(void)
 {
-       unsigned long ret;
-       ret = ((!gpio_get_value(SPITZ_GPIO_KEY_INT)
-               << GPIO_bit(SPITZ_GPIO_KEY_INT))
-               | gpio_get_value(SPITZ_GPIO_SYNC));
-       return ret;
+       return !gpio_get_value(SPITZ_GPIO_KEY_INT) ||
+               gpio_get_value(SPITZ_GPIO_SYNC);
 }
 
 unsigned long spitzpm_read_devdata(int type)