Unsolicited I2C communication causes the device to assert an interrupt; as
such the IRQ is disabled before any registers are written in iqs5xx_open()
and iqs5xx_close().
After the driver is unloaded, however, i2c_device_remove() sets the IRQ to
zero before any handlers may call input_close_device() while the device is
unregistered. This keeps iqs5xx_close() from disabling the IRQ, leading to
an interrupt storm during removal.
Placing input_register_device() in front of devm_request_threaded_irq() to
free the IRQ before iqs5xx_close() is called does not cover the case where
firmware is updated at the factory and the input device is registered well
after the driver has already probed.
The solution, therefore, is to remove the open and close callbacks as they
do not buy much in the first place. The device already starts in an active
state, then drops into a low-power mode based on activity.
As an added benefit, this change allows the 250-ms delay in initialization
to be removed as iqs5xx_open() no longer follows immediately. Instead, the
delay is replaced with a mere 50-us delay which allows the interrupt to be
deasserted before the handler is registered.
Signed-off-by: Jeff LaBundy <jeff@xxxxxxxxxxx>
---
Changes in v2:
- None
drivers/input/touchscreen/iqs5xx.c | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c
index a990c176abf7..350466ff6bbd 100644
--- a/drivers/input/touchscreen/iqs5xx.c
+++ b/drivers/input/touchscreen/iqs5xx.c
@@ -468,20 +468,6 @@ static int iqs5xx_set_state(struct i2c_client *client, u8 state)
return error2;
}
-static int iqs5xx_open(struct input_dev *input)
-{
- struct iqs5xx_private *iqs5xx = input_get_drvdata(input);
-
- return iqs5xx_set_state(iqs5xx->client, IQS5XX_RESUME);
-}
-
-static void iqs5xx_close(struct input_dev *input)
-{
- struct iqs5xx_private *iqs5xx = input_get_drvdata(input);
-
- iqs5xx_set_state(iqs5xx->client, IQS5XX_SUSPEND);
-}
-
static int iqs5xx_axis_init(struct i2c_client *client)
{
struct iqs5xx_private *iqs5xx = i2c_get_clientdata(client);
@@ -497,10 +483,7 @@ static int iqs5xx_axis_init(struct i2c_client *client)
input->name = client->name;
input->id.bustype = BUS_I2C;
- input->open = iqs5xx_open;
- input->close = iqs5xx_close;
- input_set_drvdata(input, iqs5xx);
iqs5xx->input = input;
}
@@ -622,13 +605,7 @@ static int iqs5xx_dev_init(struct i2c_client *client)
iqs5xx->dev_id_info = *dev_id_info;
- /*
- * The following delay allows ATI to complete before the open and close
- * callbacks are free to elicit I2C communication. Any attempts to read
- * from or write to the device during this time may face extended clock
- * stretching and prompt the I2C controller to report an error.
- */
- msleep(250);
+ usleep_range(50, 100);
return 0;
}
--
2.17.1
