[PATCH 29/40] Input: atmel_mxt_ts - Use wait_for_chg in soft_reset
From: Nick Dyer <hidden>
Date: 2013-02-22 18:08:48
Also in:
lkml
Subsystem:
atmel maxtouch driver, input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Nick Dyer, Dmitry Torokhov, Linus Torvalds
Signed-off-by: Nick Dyer <redacted> --- drivers/input/touchscreen/atmel_mxt_ts.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index f182228..96c961e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c@@ -1044,7 +1044,6 @@ static int mxt_t6_command(struct mxt_data *data, u16 cmd_offset, u8 value, bool static int mxt_soft_reset(struct mxt_data *data, u8 value) { int ret; - int timeout_counter = 0; struct device *dev = &data->client->dev; dev_info(dev, "Resetting chip\n");
@@ -1057,14 +1056,7 @@ static int mxt_soft_reset(struct mxt_data *data, u8 value) msleep(MXT_RESET_NOCHGREAD); } else { msleep(MXT_RESET_TIME); - - timeout_counter = 0; - while ((timeout_counter++ <= 100) && data->pdata->read_chg()) - msleep(20); - if (timeout_counter > 100) { - dev_err(dev, "No response after reset!\n"); - return -EIO; - } + mxt_wait_for_chg(data); } return 0;
--
1.7.10.4