From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932395AbdJYUQ4 (ORCPT ); Wed, 25 Oct 2017 16:16:56 -0400 Received: from mout.web.de ([212.227.15.3]:52570 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932348AbdJYUQu (ORCPT ); Wed, 25 Oct 2017 16:16:50 -0400 Subject: [PATCH 1/2] iio/accel/stk8ba50: Use common error handling code in stk8ba50_probe() From: SF Markus Elfring To: linux-iio@vger.kernel.org, Hartmut Knaack , Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Tiberiu Breana Cc: LKML , kernel-janitors@vger.kernel.org References: <5ab7e200-2dea-63e2-06db-0e185f563d16@users.sourceforge.net> Message-ID: <0f26a13b-7bbf-525b-a864-8aa8e13c3aef@users.sourceforge.net> Date: Wed, 25 Oct 2017 22:16:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <5ab7e200-2dea-63e2-06db-0e185f563d16@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:kOylYKMh6TZD8YfeNs29z0nGpfVtzX8bkqYCzK7nnegQnoidQNC hTpXteADOGGOvtUbafE2NU/LuI1jH2UNtH5OY/Z+Qif/exZRTMbHPlAa0H+5UJl6T0FU5fw e3B4XlRBeDtBNrJNc0uSLk7rhtpqLllh2f2TJdTttYIZa73H/DubDMhy3T7y+WR8PVdb444 p05nFN+bNMIl+CgZwPu7A== X-UI-Out-Filterresults: notjunk:1;V01:K0:MiqwDBI7CTU=:yg2azXa8V1NzN/F83WYDL3 k0rvR2dt+cbXM/lJR4vDR446sGXA4OwHbApBOAObYdGAFJzhVeAGCEbrv9lvYRFCLLwFkERn/ UpEgCR6PcRZjBEPl6hwDgvwHcwcUOWJpLfU1grv4nt2zt/uzYMlVnr9qCmL+r+JVkJGsnp9CR 2syIfKC3v0OURcgqvU9fq9ydX124NwTMJWzsQd6J12TIywhwIMdIdbUMlUNaeCLwYaA367M5S 968tTMt1GZbM3QjxYiWwBgs8ehwRGleJswOb7fM0gdv7wEYsh9yrWf3pORPnHXKLwp+lNKGlc 6/vaRbA20Vr6N6fAhDo7AtYBSTGDbBqcAODHLgWR24c7cB8w6Pc7FwkVHxcSzFpwvIdCza5Vs 6/d1h3wXr3HX5Z4Q4vDz04FLhdYOjYSC9BasgTVqu+mrmJt/quQGTbbgDPhyPPlKsgBnLR2tQ bnDgy8/vaRw0wvSvrSDQX/wbML4utMZzfjzITVIcyK7Cc4+USFYF8QiLEGx0jT6su7A6fZ8m4 ClA2m728aM5XhodnrT5mkKT7OluHTlT2y54FO4iDkfpwq1450AVOoQIdvnUHYdRbmpQ2Hytp0 TV3rY/hTn9w89fWwpRe5W+bXBFQbHJBUU7+RnFHfilGiXySfnlLzejY1Xs0eTPYK+rX0/kQMT pK8fW2TnrqmRNmYNc18vJMLPtOjILyFzyBSXoVVDl2oteGW95ja2sGNFTyHdua3eKv+BZp6Yo aZ+o31IcY+dYWWDA0fdx/qC/sr8aPx007OrvykFts009QfCeENPoHN898hP9+REiUR+F57P6q Zp8exRqW2IuCA7bhFchLNr0EuYijo2S6y5kjBP7Jtl6djC4/d4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 25 Oct 2017 21:36:03 +0200 * Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Replace two calls of the function "dev_err" by goto statements. * Adjust condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/iio/accel/stk8ba50.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c index 576b6b140f08..afe90567ad37 100644 --- a/drivers/iio/accel/stk8ba50.c +++ b/drivers/iio/accel/stk8ba50.c @@ -426,16 +426,13 @@ static int stk8ba50_probe(struct i2c_client *client, /* Set up interrupts */ ret = i2c_smbus_write_byte_data(client, STK8BA50_REG_INTEN2, STK8BA50_DREADY_INT_MASK); - if (ret < 0) { - dev_err(&client->dev, "failed to set up interrupts\n"); - goto err_power_off; - } + if (ret) + goto report_failure; + ret = i2c_smbus_write_byte_data(client, STK8BA50_REG_INTMAP2, STK8BA50_DREADY_INT_MAP); - if (ret < 0) { - dev_err(&client->dev, "failed to set up interrupts\n"); - goto err_power_off; - } + if (ret) + goto report_failure; if (client->irq > 0) { ret = devm_request_threaded_irq(&client->dev, client->irq, @@ -495,6 +492,10 @@ static int stk8ba50_probe(struct i2c_client *client, err_power_off: stk8ba50_set_power(data, STK8BA50_MODE_SUSPEND); return ret; + +report_failure: + dev_err(&client->dev, "failed to set up interrupts\n"); + goto err_power_off; } static int stk8ba50_remove(struct i2c_client *client) -- 2.14.3