From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752640AbcF1PHk (ORCPT ); Tue, 28 Jun 2016 11:07:40 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37465 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488AbcF1PHi (ORCPT ); Tue, 28 Jun 2016 11:07:38 -0400 Date: Tue, 28 Jun 2016 16:08:29 +0100 From: Lee Jones To: SF Markus Elfring Cc: Tony Lindgren , linux-omap@vger.kernel.org, LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH 6/6] mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe() Message-ID: <20160628150829.GN24982@dell> 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> <7de4f21e-30a2-fab6-204d-890619ccbbe6@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7de4f21e-30a2-fab6-204d-890619ccbbe6@users.sourceforge.net> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 26 Jun 2016, SF Markus Elfring wrote: > 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(-) Applied, thanks. > 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; > } > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog