From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752264AbcFZNy2 (ORCPT ); Sun, 26 Jun 2016 09:54:28 -0400 Received: from mout.web.de ([217.72.192.78]:53899 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752021AbcFZNy1 (ORCPT ); Sun, 26 Jun 2016 09:54:27 -0400 Subject: [PATCH 6/6] mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe() To: Lee Jones , Tony Lindgren , linux-omap@vger.kernel.org References: <566ABCD9.1060404@users.sourceforge.net> <5682D228.7070902@users.sourceforge.net> <20160111082922.GB14104@x1> <05b7db2a-437a-60ac-d289-71d2150e7f5f@users.sourceforge.net> <20160608111442.GB14888@dell> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <7de4f21e-30a2-fab6-204d-890619ccbbe6@users.sourceforge.net> Date: Sun, 26 Jun 2016 15:54:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:APZecT7yJ0hMaN8so6Unsii33KU1jNDgsIBJRlaBD3Vx0uvcMNN 6MGYMYX5/cSZa0PN2myC0NKyrG11ji/1SbSx3YiZd3PGVoqqmLk0Ii5h4re5NZWIgyQUTsC Fd25yqN5HMAokxwrbhB6fcj8AJX64+U+6rhW4trz6PlXXaUHW/y3hjZkZ15CTC21N1RHdC7 oaeWmZZ6vgt1PyoJ1FKtw== X-UI-Out-Filterresults: notjunk:1;V01:K0:IOCsOqOlR9k=:R5hYcGB82M9/l1MRLcUupm 7oD7nxgR6cWOUtbjBF5hFFTUFRzcC0CP/Vhvi45AswASsg/CjCjqVkxZ+rZ2K5Dv53uK+tVKv +SHt6lyFard78ilv6EJkQj/bhwB9Fx1uPRTdbeePFFklySzFLgGmawNr+bXNw4NkjHy1hLaMC yNROaHMUPLuj2kXGbBbrAXMgsJwcP6p/F0n/03Po/usB2rIHDus8ssKFT6tngKbcHtFzYpEXe 13zPiQ+Pmr6WI16q+jpKG1DPIDYDtLxFLh9zlPvdmyg+51vcsLDMCraeW6uomM2esbaYoXSuQ bHHg1Gy+dDKuGpCJDSpC49p7OWugXCK/6vMehXYWmkLXA8yVDW5unRkqy8yu4XGP9qmzVeISy XBwF+b6CnoMuIeNM8MnB8NjBaMt2eGPEadRSHhEeNITU045S0vuFY/xgvsaTi88yD86KvUtW8 0cuG296p/A/F/vfWL6vOlmsMhwQL2jbjpPRkJ6CZzOaDj+/FK/gjqCGchfygIKVImC0MIqgLn OwKcTVXJG3lKn2sY19rSx6m2LEXFW+IdBiCo24AQq8cvs597wE2iLbYrH05NQNZBQvj6TDQk1 d+qTSKoE96+KiKEtjpPcT52Uc9gyQep1yrZJtYAzfC/lsy23Zq7tqxwLTtbdzekYZOW8MEknu 36k8w1xmpu360Kp+Rp2ouMEvG0NMA5DLufY1821kuIzx6jSxgZJfZXAwA9xwlXFMUXY0lg//I 58z+hcaxLCJd3/RIDUdPzQtUJozEtSq8Yd/3pnjdlerMxLCNv8+JVorSKJsZE4UMxBlmALg08 U2klyTH Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 26 Jun 2016 14:30:46 +0200 This issue was detected by using the Coccinelle software. Return directly if a call of the function "devm_regmap_init_i2c" or "regmap_write" failed. Delete the jump label "err" then. Signed-off-by: Markus Elfring --- drivers/mfd/smsc-ece1099.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/smsc-ece1099.c b/drivers/mfd/smsc-ece1099.c index 2aaf89f..cd18c09 100644 --- a/drivers/mfd/smsc-ece1099.c +++ b/drivers/mfd/smsc-ece1099.c @@ -46,10 +46,8 @@ static int smsc_i2c_probe(struct i2c_client *i2c, } smsc->regmap = devm_regmap_init_i2c(i2c, &smsc_regmap_config); - if (IS_ERR(smsc->regmap)) { - ret = PTR_ERR(smsc->regmap); - goto err; - } + if (IS_ERR(smsc->regmap)) + return PTR_ERR(smsc->regmap); i2c_set_clientdata(i2c, smsc); smsc->dev = &i2c->dev; @@ -68,7 +66,7 @@ static int smsc_i2c_probe(struct i2c_client *i2c, ret = regmap_write(smsc->regmap, SMSC_CLK_CTRL, smsc->clk); if (ret) - goto err; + return ret; #ifdef CONFIG_OF if (i2c->dev.of_node) @@ -76,7 +74,6 @@ static int smsc_i2c_probe(struct i2c_client *i2c, NULL, NULL, &i2c->dev); #endif -err: return ret; } -- 2.9.0