From patchwork Thu Mar 19 14:59:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11447395 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 740D66CA for ; Thu, 19 Mar 2020 15:05:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D21220B1F for ; Thu, 19 Mar 2020 15:05:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726795AbgCSPFl (ORCPT ); Thu, 19 Mar 2020 11:05:41 -0400 Received: from esa4.mentor.iphmx.com ([68.232.137.252]:5760 "EHLO esa4.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727116AbgCSPFl (ORCPT ); Thu, 19 Mar 2020 11:05:41 -0400 X-Greylist: delayed 313 seconds by postgrey-1.27 at vger.kernel.org; Thu, 19 Mar 2020 11:05:41 EDT IronPort-SDR: ND40/2p0SCXA/bySmETgeF6jIFcWrUTKkrAcDrAnZ0B/AiTwcT8fTBeqfIx/EZ9xLBNSsWYhl/ Y03vtotzMxhHHJEd4iwCjeJh4zPGNnlnV1vaKwai89jj3iXcn5rn009H5TsDgdZLFpV/exuW+n SVcAufhSGV3WKJNP+LSLiZGiDHa4ZsaesIMaWSj4Gq7YeDm4RZwJkndwAT28b4YBaRxiWi4h6a gNFCmRB1iRFo15yu+WFG2mfeLSn5sNb/QkjdEAOHaIepGAzvW/3rsXtq01b7hRZmb733KAt03e ZWc= X-IronPort-AV: E=Sophos;i="5.70,572,1574150400"; d="scan'208";a="46926983" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 19 Mar 2020 07:02:35 -0800 IronPort-SDR: CaWIPBwHH287pTnKem2ZSIHPHoj54oZByP8YSmChTvdIeJxt6D+KJW4dWptW45Iqjx4mOuVgJY jmHXqUN9KHyTJsGE1VfanK1SbPr5G1LQtJbCLohuUg2tnP3FUt/aV60n4HtXMNMQ4D5UZSx0hb Z811byonBPDyw7HVFo2tKCfXzQ61oqkUNq5EzxO8PDEt3LucIwoYEwSwtN2Ns6MmlGgOJd1OIf 5Bm/gKW7rF+pNkL3RMkWwFcfex/WK7aSVXctpu7iBhEF7kuLxCzhQkvdz7MCgRC9NvMxCRdS9t 9GM= From: Jiada Wang To: , , , , , CC: , , , , Subject: [PATCH v8 34/52] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Date: Thu, 19 Mar 2020 07:59:58 -0700 Message-ID: <20200319150016.61398-35-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200319150016.61398-1-jiada_wang@mentor.com> References: <20200319150016.61398-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 48ec60be26db..de8cafb76712 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 */ @@ -4098,16 +4094,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)