]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: tsc2004/5 - do not use irq_set_irq_wake() directly
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 11 Jul 2024 17:27:15 +0000 (10:27 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 5 Aug 2024 01:10:40 +0000 (18:10 -0700)
Instead of setting irq_set_irq_wake() directly in probe(), mark the device
as wakeup-capable, and use enable_irq_wake() and disable_irq_wake() in
suspend/resume path.

This also allows changing the wakeup setting dynamically at runtime using
/sys/devices/.../tsc2005/power/wakeup.

Reviewed-By: Sebastian Reichel <sre@kernel.org>
Link: https://lore.kernel.org/r/20240711172719.1248373-4-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/tsc200x-core.c

index 87e6839c60fae11059c78dfbee44226ef9662e00..cd60bba11c56293b7ef5d8f8b6a39be01296220e 100644 (file)
@@ -106,7 +106,9 @@ struct tsc200x {
 
        struct gpio_desc        *reset_gpio;
        int                     (*tsc200x_cmd)(struct device *dev, u8 cmd);
+
        int                     irq;
+       bool                    wake_irq_enabled;
 };
 
 static void tsc200x_update_pen_state(struct tsc200x *ts,
@@ -560,7 +562,8 @@ int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
                return error;
        }
 
-       irq_set_irq_wake(irq, 1);
+       device_init_wakeup(dev, true);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(tsc200x_probe);
@@ -576,6 +579,9 @@ static int tsc200x_suspend(struct device *dev)
 
        ts->suspended = true;
 
+       if (device_may_wakeup(dev))
+               ts->wake_irq_enabled = enable_irq_wake(ts->irq) == 0;
+
        mutex_unlock(&ts->mutex);
 
        return 0;
@@ -587,6 +593,11 @@ static int tsc200x_resume(struct device *dev)
 
        mutex_lock(&ts->mutex);
 
+       if (ts->wake_irq_enabled) {
+               disable_irq_wake(ts->irq);
+               ts->wake_irq_enabled = false;
+       }
+
        if (ts->suspended && ts->opened)
                __tsc200x_enable(ts);