From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751661AbdJZGJU (ORCPT ); Thu, 26 Oct 2017 02:09:20 -0400 Received: from mout.web.de ([217.72.192.78]:53118 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750957AbdJZGJR (ORCPT ); Thu, 26 Oct 2017 02:09:17 -0400 To: linux-iio@vger.kernel.org, Alison Schofield , "H. Nikolaus Schaller" , Hartmut Knaack , Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler From: SF Markus Elfring Subject: [PATCH] iio/adc/palmas: Use common error handling code in palmas_gpadc_calibrate() Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <0ae3662d-6a74-622c-0423-e8552ea79bca@users.sourceforge.net> Date: Thu, 26 Oct 2017 08:08:49 +0200 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:1JQTlx5WTpyt2HKKkWa89Q2y9CD7LqVCKc30rVIlf/NbfMybssf yCuLGL/7ECBGgxj9LsLL/TY9lyctZ7Z/VrDJGWtZJIjUL+jVbHjBuf/jltBIJZAtFS9THXO 90BZ6Jylb+pPh3bRGliwzwa4WIbAlE8DtxrA8J+VfnHz6eJ9z321Ba1AgmzoJa8u3sVkEcq 1nhK3br/8Z10dYg8AJUwg== X-UI-Out-Filterresults: notjunk:1;V01:K0:vHZ41x7qkvI=:xY/20Fxh5oDOuf/Sr2Eyex CBcF40YRjGEIwUzbyfUnxPJDM+R0q/upG+Rv9zuJN+hQeOf2FSlrJDEkDr2l6EXW8P2H7pyc8 JRsQtx4vETm8hjaCUmpWhuYF1IXy7+PfhFtPWHAODDuuJavpmUQnLcFIMIbZ4RXX0TKL1XjE9 ByVjlXLPQ5ZHWF+6XLS09pgz/N4fEStwW/Y/oGVLy0atQYfVqR3K1RrfcOHwBhErRFQWtx1Ez cfHZDIbfpCoCpPOyvSPyL639g9Wfzvk+VELcbfWPSwsMiRhYOl3upPV3G4qxVyofVpy3TR0kC f9m7h5vIT0jkwmivZQLJOoG9h2Mju87WJPpmrSEgpkWBqgRMxTtIaUEZHukX9aF7Cu/Mh7g+F pQcxQkIpMrAisJO013pAPjKLOqCD2AQ81xt7ulljDX5E/RIs3nLaT8dFESLXdUhxgltcXPcwC FQQQ1x1LqkUy8gF5iIGZc/+okF4M56CLLnO1zBkPzOjhE+Uf0VUUmwMUv8R6A7GOAcuB4zCwa 7Yd/99M8pKNLj2vbUcnFLXVcWfwPdrM1TxEn8Pb3W0E/VkaJkEJjSauESanTDAwhHZ38s+5BN Hs5yLSnRKVm0Mk+4xB3MrCE/dL0A14MUAE0wS7n+HlDCvDyQfxmnLP3klZ7moDVc8VYzHsmzz r9/1L9EXhUGjO2hu5NPaJ9xYpPg3WUPnDd8HI/0f/DjnpEpXj9NtwI6thZZ/FP4J3pIzKJ+Qt EVIFt4ojHODl5QYTbh2AU8VEWHvMr5oINlJlLS2YkC5OHNfzPDmbVCJnw7EQSJjx9ETjOUkld +nnCuYV8npfDif2ivg/8hsdB3U+/Aut/LybujfcWERXb+Ycfgo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 26 Oct 2017 07:58:03 +0200 * Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Adjust condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/iio/adc/palmas_gpadc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/palmas_gpadc.c b/drivers/iio/adc/palmas_gpadc.c index 69b9affeef1e..5e6566692d46 100644 --- a/drivers/iio/adc/palmas_gpadc.c +++ b/drivers/iio/adc/palmas_gpadc.c @@ -304,17 +304,13 @@ static int palmas_gpadc_calibrate(struct palmas_gpadc *adc, int adc_chan) ret = palmas_read(adc->palmas, PALMAS_TRIM_GPADC_BASE, adc->adc_info[adc_chan].trim1_reg, &d1); - if (ret < 0) { - dev_err(adc->dev, "TRIM read failed: %d\n", ret); - goto scrub; - } + if (ret) + goto report_failure; ret = palmas_read(adc->palmas, PALMAS_TRIM_GPADC_BASE, adc->adc_info[adc_chan].trim2_reg, &d2); - if (ret < 0) { - dev_err(adc->dev, "TRIM read failed: %d\n", ret); - goto scrub; - } + if (ret) + goto report_failure; /* gain error calculation */ k = (1000 + (1000 * (d2 - d1)) / (x2 - x1)); @@ -329,6 +325,10 @@ static int palmas_gpadc_calibrate(struct palmas_gpadc *adc, int adc_chan) scrub: return ret; + +report_failure: + dev_err(adc->dev, "TRIM read failed: %d\n", ret); + goto scrub; } static int palmas_gpadc_start_conversion(struct palmas_gpadc *adc, int adc_chan) -- 2.14.3