From patchwork Wed Feb 12 08:42:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11377957 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 8B630921 for ; Wed, 12 Feb 2020 08:46:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7400B20848 for ; Wed, 12 Feb 2020 08:46:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728652AbgBLIqP (ORCPT ); Wed, 12 Feb 2020 03:46:15 -0500 Received: from esa1.mentor.iphmx.com ([68.232.129.153]:64389 "EHLO esa1.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728519AbgBLIqP (ORCPT ); Wed, 12 Feb 2020 03:46:15 -0500 IronPort-SDR: CtuHyuxn7R+bKRAuJpxaoIw8Orjvo8ZSOYM/5YBICdNyeoKQqC8oAqylajISZwT46RysxX7Scd zdJB0+q3Xa2Z66MGDjWiBxJavYWg2qiMPGG7sFxOVGgjvF0viO2nd4eeJilj6zhu30Jx+aQueD Uror4JRHvVPKDdUpLg9ZYBRMcdb2/4BRamL6RIh8tmxkjO5sU+aDBXzwCsJMbsey8pjKeAYygO SKtuJcpeqOWveJGz9Ft15ExJ4dG0GwOF7npb72HcLM4/AilQft1bHTqP0L0u1PYQtEqwYV3cuN xPg= X-IronPort-AV: E=Sophos;i="5.70,428,1574150400"; d="scan'208";a="47667075" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 12 Feb 2020 00:46:14 -0800 IronPort-SDR: 9dAan7zc/5AO2pjZ+RJSx5nIRUw5r/JI2xhQmxPg0J8PPiAtDv1dT6VdpPY0DE8k+x5SVo5YDe HApuB29wIOHaxWpFD/dIxw47Umh4LaP6Wz8jSX2dp+CNBjuKLVOtnupFvcRviozndDt2H9lBCT s9DXCxPCp9ETB6bhalOSz9uaEkAkhq3NEGGvJxAZw3jDQaLLKkTYO/BJVLScCzEZfDJd23Yv8W WyQgMy5iB0w9ojNfcTZxaWp6LyAIJJf1mf11NxvXBLfJFMGIvVkSbnTiR5CHsvwtUWYx4LDCph QoI= From: Jiada Wang To: , , , , , CC: , , , , Subject: [PATCH v7 31/48] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Date: Wed, 12 Feb 2020 00:42:01 -0800 Message-ID: <20200212084218.32344-32-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200212084218.32344-1-jiada_wang@mentor.com> References: <20200212084218.32344-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: Kautuk Consul Revamping the code to call mxt_free_object_table and mxt_free_input_device functions only in the following scenarios and code paths: 1) The error path of the mxt_probe() entry point 2) The mxt_remove de-init path entry point 3) All paths which definitely expect to populate the object table like: - the mxt_update_fw_store path which first calls mxt_load_fw and then resorts to calling mxt_initialize itself. - the mxt_read_info_block function which attempts to fill in the object table itself as the main non-error part of the logic. 4) All paths in the code expected to definitely allocate and register the input device such as: - the mxt_update_fw_store path which first calls mxt_load_fw and then resorts to calling mxt_initialize itself. - the mxt_update_cfg_store function which will call mxt_configure_objects. Signed-off-by: Kautuk Consul Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index a64793281ae8..7316a7613041 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3336,21 +3336,21 @@ static int mxt_configure_objects(struct mxt_data *data, error = mxt_init_t7_power_cfg(data); if (error) { dev_err(dev, "Failed to initialize power cfg\n"); - goto err_free_object_table; + return error; } if (cfg) { error = mxt_update_cfg(data, cfg); if (error) { dev_warn(dev, "Error %d updating config\n", error); - goto err_free_object_table; + return error; } } if (data->multitouch) { error = mxt_initialize_input_device(data); if (error) - goto err_free_object_table; + return error; } else { dev_warn(dev, "No touch object detected\n"); } @@ -3358,10 +3358,6 @@ static int mxt_configure_objects(struct mxt_data *data, mxt_debug_init(data); return 0; - -err_free_object_table: - mxt_free_object_table(data); - return error; } /* Configuration crc check sum is returned as hex xxxxxx */ @@ -4097,16 +4093,21 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) error = mxt_initialize(data); if (error) - return error; + goto err_free_object; error = sysfs_create_group(&client->dev.kobj, &mxt_fw_attr_group); if (error) { dev_err(&client->dev, "Failure %d creating fw sysfs group\n", error); - return error; + goto err_free_object; } return 0; + +err_free_object: + mxt_free_input_device(data); + mxt_free_object_table(data); + return error; } static int mxt_remove(struct i2c_client *client)