@@ -39,9 +39,7 @@
#define IQS5XX_SHOW_RESET BIT(7)
#define IQS5XX_ACK_RESET BIT(7)
-
#define IQS5XX_SUSPEND BIT(0)
-#define IQS5XX_RESUME 0
#define IQS5XX_SETUP_COMPLETE BIT(6)
#define IQS5XX_WDT BIT(5)
@@ -442,7 +440,7 @@ static int iqs5xx_set_state(struct i2c_client *client, u8 state)
struct iqs5xx_private *iqs5xx = i2c_get_clientdata(client);
int error1, error2;
- if (!iqs5xx->dev_id_info.bl_status)
+ if (!iqs5xx->dev_id_info.bl_status || device_may_wakeup(&client->dev))
return 0;
mutex_lock(&iqs5xx->lock);
@@ -462,10 +460,7 @@ static int iqs5xx_set_state(struct i2c_client *client, u8 state)
mutex_unlock(&iqs5xx->lock);
- if (error1)
- return error1;
-
- return error2;
+ return error1 ? : error2;
}
static int iqs5xx_axis_init(struct i2c_client *client)
@@ -946,40 +941,12 @@ static const struct attribute_group iqs5xx_attr_group = {
static int __maybe_unused iqs5xx_suspend(struct device *dev)
{
- struct iqs5xx_private *iqs5xx = dev_get_drvdata(dev);
- struct input_dev *input = iqs5xx->input;
- int error = 0;
-
- if (!input || device_may_wakeup(dev))
- return error;
-
- mutex_lock(&input->mutex);
-
- if (input_device_enabled(input))
- error = iqs5xx_set_state(iqs5xx->client, IQS5XX_SUSPEND);
-
- mutex_unlock(&input->mutex);
-
- return error;
+ return iqs5xx_set_state(to_i2c_client(dev), IQS5XX_SUSPEND);
}
static int __maybe_unused iqs5xx_resume(struct device *dev)
{
- struct iqs5xx_private *iqs5xx = dev_get_drvdata(dev);
- struct input_dev *input = iqs5xx->input;
- int error = 0;
-
- if (!input || device_may_wakeup(dev))
- return error;
-
- mutex_lock(&input->mutex);
-
- if (input_device_enabled(input))
- error = iqs5xx_set_state(iqs5xx->client, IQS5XX_RESUME);
-
- mutex_unlock(&input->mutex);
-
- return error;
+ return iqs5xx_set_state(to_i2c_client(dev), 0);
}
static SIMPLE_DEV_PM_OPS(iqs5xx_pm, iqs5xx_suspend, iqs5xx_resume);
The device should be allowed to enter its lowest-power state during suspend, even if there are no users. Therefore, drop the check from iqs5xx_suspend(). It follows that the same check must be removed from iqs5xx_resume() since users are not guaranteed to be present upon resume, and there would be no way to power the device back up. This change makes iqs5xx_suspend() and iqs5xx_resume() both smaller and easier to follow. And because these are the only functions that call iqs5xx_set_state() now, call device_may_wakeup() from there to avoid duplicate logic. While here, collapse the return path for iqs5xx_set_state() to save a few lines of code. Signed-off-by: Jeff LaBundy <jeff@labundy.com> --- drivers/input/touchscreen/iqs5xx.c | 41 +++--------------------------- 1 file changed, 4 insertions(+), 37 deletions(-)