From patchwork Tue Oct 29 07:19:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11217447 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58F5C14E5 for ; Tue, 29 Oct 2019 07:24:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FFED2086A for ; Tue, 29 Oct 2019 07:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727654AbfJ2HX4 (ORCPT ); Tue, 29 Oct 2019 03:23:56 -0400 Received: from esa3.mentor.iphmx.com ([68.232.137.180]:41267 "EHLO esa3.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730405AbfJ2HVP (ORCPT ); Tue, 29 Oct 2019 03:21:15 -0400 IronPort-SDR: tHa+BnwYCsWurXeM1sF6c/qmXGK48G70rd7EiR32x+UbzZpdzBYcubbvfLM7Oxj42o6l1K3PVS YsK3P1/4JlHN8PcPqfBYno5o9H7/tM8all5Dl9bjo1/UwzpPoVPXzypt1LbRNq2qNpfLv13NIR UPxCq6QKhI8MZSkI4Fm9Boyz1piQ8UTeNqARXa2QHck2zYBCPl4WZkfGHRbGsA0DiE5JPZ0F2d Ezf4EP2/uQP7PctEOee0ZGNdK2dYv5cwhCYkKNHgti9DgellGRHEsv5GmBT0Zas7OUrh1CuL4x AHE= X-IronPort-AV: E=Sophos;i="5.68,243,1569312000"; d="scan'208";a="42663234" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 28 Oct 2019 23:21:05 -0800 IronPort-SDR: Mwyz0CmQjRNK5Cm+cYVz7t8jSIztEfKXCBM5XBEve6NRh5XWusuT7eB/RqTUvzEeFuYfKvkzss pPypSBdSk1axiVX4SeGRULVlwEO+3n/9dxZcupbhqfIVAI5GEvJlvFTdKNUzRJX00UUqsjONS8 WO4dX/NHIlI/SzqldFumBdcPldzLrkO3cm8FdF54KiNj4aRg8ITLnv0FWDQT39yCEZfFsjXz4r 6b7REEhQWqw8Wy6prpFEGD2qxiAru7kgkwad8gxoODmFodGkBSXXKCvjWhGhJC/AOAQgISfF1U +54= From: Jiada Wang To: , , , CC: , , , , Subject: [PATCH v4 14/48] Input: atmel_mxt_ts - report failures in suspend/resume Date: Tue, 29 Oct 2019 16:19:36 +0900 Message-ID: <20191029072010.8492-15-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191029072010.8492-1-jiada_wang@mentor.com> References: <20191029072010.8492-1-jiada_wang@mentor.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Nick Dyer (cherry picked from ndyer/linux/for-upstream commit 93a57575403de4dd07cd64807d3c2ed7f2cca262) [gdavis: Resolve forward port conflicts due to applying upstream commit 96a938aa214e ("Input: atmel_mxt_ts - remove platform data support").] Signed-off-by: George G. Davis [jiada: Fix compilation warning] Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 51 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index c9f010ce46d5..b28bcbb315c2 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3425,10 +3425,12 @@ static void mxt_reset_slots(struct mxt_data *data) mxt_input_sync(data); } -static void mxt_start(struct mxt_data *data) +static int mxt_start(struct mxt_data *data) { + int ret = 0; + if (!data->suspended || data->in_bootloader) - return; + return 0; switch (data->suspend_mode) { case MXT_SUSPEND_T9_CTRL: @@ -3453,28 +3455,42 @@ static void mxt_start(struct mxt_data *data) */ mxt_process_messages_until_invalid(data); - mxt_set_t7_power_cfg(data, MXT_POWER_CFG_RUN); + ret = mxt_set_t7_power_cfg(data, MXT_POWER_CFG_RUN); + if (ret) + return ret; /* Recalibrate since chip has been in deep sleep */ - mxt_t6_command(data, MXT_COMMAND_CALIBRATE, 1, false); + ret = mxt_t6_command(data, MXT_COMMAND_CALIBRATE, 1, false); + if (ret) + return ret; + + ret = mxt_acquire_irq(data); + if (ret) + return ret; - mxt_acquire_irq(data); break; } data->suspended = false; + + return 0; } -static void mxt_stop(struct mxt_data *data) +static int mxt_stop(struct mxt_data *data) { + int ret; + if (data->suspended || data->in_bootloader) - return; + return 0; switch (data->suspend_mode) { case MXT_SUSPEND_T9_CTRL: /* Touch disable */ - mxt_write_object(data, + ret = mxt_write_object(data, MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0); + if (ret) + return ret; + break; case MXT_SUSPEND_REGULATOR: @@ -3487,29 +3503,40 @@ static void mxt_stop(struct mxt_data *data) default: disable_irq(data->irq); - mxt_set_t7_power_cfg(data, MXT_POWER_CFG_DEEPSLEEP); + ret = mxt_set_t7_power_cfg(data, MXT_POWER_CFG_DEEPSLEEP); + if (ret) + return ret; mxt_reset_slots(data); break; } data->suspended = true; + return 0; } static int mxt_input_open(struct input_dev *dev) { struct mxt_data *data = input_get_drvdata(dev); + int ret; - mxt_start(data); + ret = mxt_start(data); - return 0; + if (ret) + dev_err(&data->client->dev, "%s failed rc=%d\n", __func__, ret); + + return ret; } static void mxt_input_close(struct input_dev *dev) { struct mxt_data *data = input_get_drvdata(dev); + int ret; - mxt_stop(data); + ret = mxt_stop(data); + + if (ret) + dev_err(&data->client->dev, "%s failed rc=%d\n", __func__, ret); } static int mxt_parse_device_properties(struct mxt_data *data)