From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932200Ab3BVSIs (ORCPT ); Fri, 22 Feb 2013 13:08:48 -0500 Received: from [89.21.227.133] ([89.21.227.133]:47367 "EHLO mail.kdh.itdev.co.uk" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1759041Ab3BVSIe (ORCPT ); Fri, 22 Feb 2013 13:08:34 -0500 From: Nick Dyer To: Dmitry Torokhov , Daniel Kurtz , Henrik Rydberg , Joonyoung Shim , Alan.Bowens@atmel.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, pmeerw@pmeerw.net, bleung@chromium.org, olofj@chromium.org Cc: Nick Dyer Subject: [PATCH 29/40] Input: atmel_mxt_ts - Use wait_for_chg in soft_reset Date: Fri, 22 Feb 2013 17:58:16 +0000 Message-Id: <1361555907-19840-30-git-send-email-nick.dyer@itdev.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361555907-19840-1-git-send-email-nick.dyer@itdev.co.uk> References: <1361555907-19840-1-git-send-email-nick.dyer@itdev.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Nick Dyer --- 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