From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755442AbdKBJQz (ORCPT ); Thu, 2 Nov 2017 05:16:55 -0400 Received: from mout.web.de ([212.227.15.3]:64502 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbdKBJQx (ORCPT ); Thu, 2 Nov 2017 05:16:53 -0400 To: linux-rtc@vger.kernel.org, support.opensource@diasemi.com, Alessandro Zummo , Alexandre Belloni Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] rtc-da9063: Use common error handling code in da9063_rtc_probe() Message-ID: <8733cf61-1c1a-cc3b-a6e9-37b9a5f8cc70@users.sourceforge.net> Date: Thu, 2 Nov 2017 10:16:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:rHt1MpBsBAGk41om9mCBjgTHCkefAqXwNd71eThCjWgDLnLolLV CcB0wyKSEtrP6XGAzAGWB7S+zBSdqEexoI6M1eakku9Bxkqz1sDXPdCksDVjwN20gkw1CHO ZxwkXK4jjoFcIAFdckvfIHXQZGt80YelxgJ71k7D9IaqG8BObZx8pJIyM/Lz+aJEQxPnVKW zVlAhACxpLy0zl85F9e3g== X-UI-Out-Filterresults: notjunk:1;V01:K0:6eTNhxI263M=:hu8idQEZOFg1v4JFf+omyu jgyZ7Cgig3aZcdXRTfmjZMhRUH4Cf9Z/I8SkqT0dgrnS4OW6GZNDuPx5iRWUCgqjNLHLCqj7z nN/rbbzQpCe2IBDDcqfLgmSRtqjCktvvyt3Q9f/Xqk1y/hfp/UEy1yXWac8xppA7X1Eif/mYs ldMggA4YQOLHd8WsfnToM7h/zMCkSUDCGmMLRDKyTog8sdnJXL9SD7AL2/KH1zP6Ms7ZwRm18 gbrMpOZq0tIp/1ye9dvXEQdCKc2iYfG4naLJkfupdpgiWjfTRrA/stjiorm6KxPu2IpCUjKyg MVJpBqNSvgXm2RMn6o7zE/0pDBCY3QQ0YASNRmb0Sg5g4GRyQ08Joo2YnwzBW/vzm6kOy+du1 VuqdUVMr7Is/MJcTs0TJ82xSF17p+32zOIGUFpcegwEWxMTfLHQQhJIPhZ4BWzvKH/ufIRnia OeODkvT8NkfVGgiL9d4Jk9eCXiuF9NcO0DjI0yUqPc2EE55aUYg+YYYOSBIk8NgEEfrxLakGh Q68pUdqJ7Uy3A2jBGIYv78pNU3IfxSR9jm7i4eSZAYbpSBrzgR7CCKD1D+IEQPLP638xEc9hF ryEpp6AWPrN32U8Fk0tdhVsC7zVYuktuHQ+kBUE+9eHKtAKKNjyYRqK9hx7dIj0tzfcrMnf7p SLJ4gRaN1ltUEtwwc3Y6J5IhtXY3a+L/36zloJpXJQ5OpnQPcIZ0m5hTEvlvW4N0M3Wkyl6IJ /CyOcsbci3W2Vobg9x1U1xEPZatVA70YTWbGRgt/VfO8+dh7XhARGvr72SuYcfgDqdMtFO69K n1mk3kzJCig///3ZpRtrRg6RAUh7wwWfZqkFcCohD9cvUqcyL0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 2 Nov 2017 09:45:46 +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. * Adjust two condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/rtc/rtc-da9063.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c index f85cae240f12..c5cbd40666aa 100644 --- a/drivers/rtc/rtc-da9063.c +++ b/drivers/rtc/rtc-da9063.c @@ -436,19 +436,15 @@ static int da9063_rtc_probe(struct platform_device *pdev) config->rtc_alarm_secs_reg, config->rtc_alarm_status_mask, 0); - if (ret < 0) { - dev_err(&pdev->dev, "Failed to access RTC alarm register\n"); - return ret; - } + if (ret) + goto report_access_failure; ret = regmap_update_bits(rtc->regmap, config->rtc_alarm_secs_reg, DA9063_ALARM_STATUS_ALARM, DA9063_ALARM_STATUS_ALARM); - if (ret < 0) { - dev_err(&pdev->dev, "Failed to access RTC alarm register\n"); - return ret; - } + if (ret) + goto report_access_failure; ret = regmap_update_bits(rtc->regmap, config->rtc_alarm_year_reg, @@ -490,6 +486,10 @@ static int da9063_rtc_probe(struct platform_device *pdev) irq_alarm, ret); return ret; + +report_access_failure: + dev_err(&pdev->dev, "Failed to access RTC alarm register\n"); + return ret; } static struct platform_driver da9063_rtc_driver = { -- 2.14.3