From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbdJ3Vfe (ORCPT ); Mon, 30 Oct 2017 17:35:34 -0400 Received: from mout.web.de ([212.227.17.12]:57707 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752929AbdJ3Vfc (ORCPT ); Mon, 30 Oct 2017 17:35:32 -0400 Subject: [PATCH 1/2] max8997_charger: Use common error handling code in max8997_battery_probe() From: SF Markus Elfring To: linux-pm@vger.kernel.org, Sebastian Reichel Cc: LKML , kernel-janitors@vger.kernel.org References: <286b1fea-ccff-5fed-5e2d-fc3b0064cd4d@users.sourceforge.net> Message-ID: Date: Mon, 30 Oct 2017 22:35:25 +0100 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: <286b1fea-ccff-5fed-5e2d-fc3b0064cd4d@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:f0jT9baFwpDupR5tEJQaHLqjPWZvnnLqJd5I+SY8luyv3fiBnUV nXFvFIvoD2zsVybZg7DnrNoKtD584HYFpGB9otycP/onBJLZhTov118Rc6In7kJYb6Q/Egp 3QQ4dWJV4Lnt+FCafNnVq5DFmInBtPF9aJXl/H3wCiOzv3Rbb5sYSCf/lXmLIvrllJEH6rM cEPf2iJRoCG19lqPZTJHQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:a9inGD2G3iQ=:ZNmmUcDuZlfGPuLULoJV9D oSB3SF+9rpTyrk3WdRAgzOyZvQsuDMT/xroO6fzulhAy+5blQJRXLuxHa/lAiRt828GAUcW6p p59f2e5JIio+zheRWk7wUCIgNWqOqFz0ls7u2EO8gMyadQIS6fIDWkVLdgSja8wrzEwFP6bYm cAZiMPGB0tyoVrbymYzGld6J5Qk5GOMy+F3yZI5EVKQqI5cjuSsn6IEuZgrgkIyyLdFs0+tGb QOF4SZ45rGa6rGDYvtPs6PfA1E09ZEJfE7G2Dx+AKeSMDczVHJzVsW1g8ypz+tlsv4pM4XUVY F+sb0cNFugtR6Xqtq07HIHrero8wVyT5EW0PQ3zZrmZpgrqNx9NlOI9HiirY9dwKsVLyaGcCg aqDphJUsZDfbpeUd8cF2JGjJBUYjgF1bYmszlKv7ZQphDByhhtBGOmJW4pbD4tFa70gcTmrAe 0y46RRpWylL+QBRYKyDuY+JH1lVfmZorPQAMhwe9FNSweewGbEkcRmcDw8c9U89Vox7KLyTw9 cV5WjpadQ09m6z9C0fuRkeYvhWs4WriVnsUFjv9C0jpKK5YT4W3wOTZ2dGdP7RX+3fhqgcjK3 SExFHdyPWWtsZqJssLPcjrFYhB1/gotKFs8iR3bLsagU72lQ5Me9CJhidvKtHykc1Fh9anuaG 78LBbl+CZdaFCwGj7wpg4HYYrzvOWBSHg0zLx4Q+RHRP3ZS1gSNjNLiPuvA4t/Ck67YekYu2T 6KmVewlGd93CW/n0EXcyKizhSO2n59gpOmQ3cPS8f40ziKe/ui6wvkhX79YIjb9N/Aqgdprr9 9vRjcDhGKsSwRdOggNb3EyGFuv2MJNGUwCV3l7jt3hNJSkWGls= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 30 Oct 2017 22:14:52 +0100 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. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/power/supply/max8997_charger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c index fa861003fece..38a01706a56b 100644 --- a/drivers/power/supply/max8997_charger.c +++ b/drivers/power/supply/max8997_charger.c @@ -113,10 +113,8 @@ static int max8997_battery_probe(struct platform_device *pdev) ret = max8997_update_reg(iodev->i2c, MAX8997_REG_MBCCTRL5, val, 0xf); - if (ret < 0) { - dev_err(&pdev->dev, "Cannot use i2c bus.\n"); - return ret; - } + if (ret < 0) + goto report_bus_failure; } switch (pdata->timeout) { @@ -141,10 +139,8 @@ static int max8997_battery_probe(struct platform_device *pdev) pdata->timeout); return -EINVAL; } - if (ret < 0) { - dev_err(&pdev->dev, "Cannot use i2c bus.\n"); - return ret; - } + if (ret < 0) + goto report_bus_failure; charger = devm_kzalloc(&pdev->dev, sizeof(struct charger_data), GFP_KERNEL); @@ -168,6 +164,10 @@ static int max8997_battery_probe(struct platform_device *pdev) } return 0; + +report_bus_failure: + dev_err(&pdev->dev, "Cannot use i2c bus.\n"); + return ret; } static const struct platform_device_id max8997_battery_id[] = { -- 2.14.3