Staging: dream: remove wakelock support

[net-next-2.6.git] / drivers / staging / dream / gpio_input.c

diff --git a/drivers/staging/dream/gpio_input.c b/drivers/staging/dream/gpio_input.c
index 7e307f267a2a059b64a3fb9c8a379b149016b2f8..0638ec43601a9058b05ae7eb7b2f5de7fd7a261e 100644 (file)
--- a/drivers/staging/dream/gpio_input.c
+++ b/drivers/staging/dream/gpio_input.c
@@ -19,7 +19,6 @@
 #include <linux/hrtimer.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/wakelock.h>
 
 enum {
        DEBOUNCE_UNSTABLE     = BIT(0), /* Got irq, while debouncing */
@@ -44,7 +43,6 @@ struct gpio_input_state {
        int use_irq;
        int debounce_count;
        spinlock_t irq_lock;
-       struct wake_lock wake_lock;
        struct gpio_key_state key_state[0];
 };
 
@@ -143,8 +141,6 @@ static enum hrtimer_restart gpio_event_input_timer_func(struct hrtimer *timer)
                hrtimer_start(timer, ds->info->debounce_time, HRTIMER_MODE_REL);
        else if (!ds->use_irq)
                hrtimer_start(timer, ds->info->poll_time, HRTIMER_MODE_REL);
-       else
-               wake_unlock(&ds->wake_lock);
 
        spin_unlock_irqrestore(&ds->irq_lock, irqflags);
 
@@ -170,7 +166,6 @@ static irqreturn_t gpio_event_input_irq_handler(int irq, void *dev_id)
                if (ks->debounce & DEBOUNCE_WAIT_IRQ) {
                        ks->debounce = DEBOUNCE_UNKNOWN;
                        if (ds->debounce_count++ == 0) {
-                               wake_lock(&ds->wake_lock);
                                hrtimer_start(
                                        &ds->timer, ds->info->debounce_time,
                                        HRTIMER_MODE_REL);
@@ -277,7 +272,6 @@ int gpio_event_input_func(struct input_dev *input_dev,
                ds->debounce_count = di->keymap_size;
                ds->input_dev = input_dev;
                ds->info = di;
-               wake_lock_init(&ds->wake_lock, WAKE_LOCK_SUSPEND, "gpio_input");
                spin_lock_init(&ds->irq_lock);
 
                for (i = 0; i < di->keymap_size; i++) {
@@ -336,7 +330,6 @@ err_gpio_configure_failed:
 err_gpio_request_failed:
                ;
        }
-       wake_lock_destroy(&ds->wake_lock);
        kfree(ds);
 err_ds_alloc_failed:
        return ret;