Messages in this thread Patch in this message | | | From | "Rafael J. Wysocki" <> | Subject | [PATCH 3/3] gpio-keys / PM: use enable/disable_device_irq_wake() | Date | Wed, 30 Jul 2014 23:52:26 +0200 |
| |
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Use enable/disable_device_irq_wake() instead of enable/disable_irq_wake(), respectively, to prepare the gpio-keys interrupt for waking up the system from sleep states.
That is safe with respect to shared interrupts and allows the IRQ subsystem to take care of IRQ configuration at the right time instead of going all the way to the hardware and reconfiguring it right away. It also allows gpio-keys to wake up the system from the "freeze" sleep state (suspend-to-idle).
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> --- drivers/input/keyboard/gpio_keys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-pm/drivers/input/keyboard/gpio_keys.c =================================================================== --- linux-pm.orig/drivers/input/keyboard/gpio_keys.c +++ linux-pm/drivers/input/keyboard/gpio_keys.c @@ -788,7 +788,7 @@ static int gpio_keys_suspend(struct devi for (i = 0; i < ddata->pdata->nbuttons; i++) { struct gpio_button_data *bdata = &ddata->data[i]; if (bdata->button->wakeup) - enable_irq_wake(bdata->irq); + enable_device_irq_wake(bdata->irq, bdata); } } else { mutex_lock(&input->mutex); @@ -811,7 +811,7 @@ static int gpio_keys_resume(struct devic for (i = 0; i < ddata->pdata->nbuttons; i++) { struct gpio_button_data *bdata = &ddata->data[i]; if (bdata->button->wakeup) - disable_irq_wake(bdata->irq); + disable_device_irq_wake(bdata->irq, bdata); } } else { mutex_lock(&input->mutex);
| |