Input: st1232 - rely on I2C core to configure wakeup interrupt

When I2C client is created with I2C_CLIENT_WAKE flag (which happens
either because we have "wakeup-source" device property or the flag
was passed in when creating an I2C client manually), I2C core will
take care of configuring interrupt as wakeup source on suspend.

Tested-by: Matthias Fend <Matthias.Fend@wolfvision.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index f1b97075aa9b5226d69a1e92c2179dac9eb29f99..bb116f41f1c0fc89398f5cf04fbdf91c68c04187 100644 (file)
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -284,12 +284,10 @@ static int __maybe_unused st1232_ts_suspend(struct device *dev)
        struct i2c_client *client = to_i2c_client(dev);
        struct st1232_ts_data *ts = i2c_get_clientdata(client);
 
-       if (device_may_wakeup(&client->dev)) {
-               enable_irq_wake(client->irq);
-       } else {
-               disable_irq(client->irq);
+       disable_irq(client->irq);
+
+       if (!device_may_wakeup(&client->dev))
                st1232_ts_power(ts, false);
-       }
 
        return 0;
 }
@@ -299,12 +297,10 @@ static int __maybe_unused st1232_ts_resume(struct device *dev)
        struct i2c_client *client = to_i2c_client(dev);
        struct st1232_ts_data *ts = i2c_get_clientdata(client);
 
-       if (device_may_wakeup(&client->dev)) {
-               disable_irq_wake(client->irq);
-       } else {
+       if (!device_may_wakeup(&client->dev))
                st1232_ts_power(ts, true);
-               enable_irq(client->irq);
-       }
+
+       enable_irq(client->irq);
 
        return 0;
 }