From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932724AbdJ3UuS (ORCPT ); Mon, 30 Oct 2017 16:50:18 -0400 Received: from mout.web.de ([212.227.17.12]:63265 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932153AbdJ3UuR (ORCPT ); Mon, 30 Oct 2017 16:50:17 -0400 To: linux-pm@vger.kernel.org, =?UTF-8?Q?Pali_Roh=c3=a1r?= , Sebastian Reichel Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] bq2415x_charger: Use common error handling code in bq2415x_timer_work() Message-ID: <48b34d35-8c41-d25b-0cb7-6257b37c5a44@users.sourceforge.net> Date: Mon, 30 Oct 2017 21:50:10 +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:CGrkiwJ8eeGHW6+kTC9pzjWIpIiBoL02+zIM+YxOcDe3vHrFtoT 2oLxarEPwKXH9c0GuKJQ7vxWvpQzQOQBWnOKNd+1pvj1qRYd9oNacZ4KPc8twPfcBSeeXCp oO7SlsEMcP8eKp8rX0+psT3liIlJE4OBrK2zl+dI5QAyL5UIky25FOsvYKklY+a/ZuOLdR7 zRLUgzrc4/9qFKpHzbaKQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:j7o38blvxm8=:elTVZ4QqjTRy18czCr2o8d O67DfExMAH3k+Yt70Lr6q45ozXaa8GXUmsBiEtbXFRDKovtfrxe0+uKTD43q95D+Y9FM3k2Tq wCjKtpv7j3xVMmXcKeIRD2OSJqSaRIW22fIDp6xEGLPA5jMdHIcFRpKt5Ikyus+mUGH0m+nAr ODjlNL1GIQPp7hl30P4yU3DMiBpxSbIJUbgdEtN75+cN4DXcmK4AtgG4OoOw8nlw/yCAlm6Ip Sj/A3VGmNoNP32T97xB7/Uq4Pj4mZKnuvf9zc0RhEdtsbDLlBM92XOl5T4OEo5JwXiDmLw6z+ Y0ec8WZP634w81v65pkl9WnZfgkkwJUPxrQOJZnrANxe/vcnUMqaF6OgMZ3pLjkgD9S3KdAND dUFs4n1HMiWiDEZcoKhVmIlihRj+1sJ6JbNq0kfcCMtW/pE/eWQpg1DUNc13IEk4F5J+jHLiN vdrxo9jkJyu0xA77vAXxhUfxsFB+nREENCK2n5IiMFHof7VwsheTjTj4g1shAwriALXRp9Hvu l3UQbDWfCw1mLV8Ey2AXuRsE26gEjmg7VQrMXpuFn8WXwCy7lYsg4k9makVSbuH+WIw+Ql0QY HHSzXZjgM+CjWKsaBftLpl1PfuaDGcaPfMO8S549QWInomV09VHTAjoyWebmaM8lJ2hCA9Iq6 z/6b2gfs93okJMGfgf3rOi8E10k9fecoqMmJ9u0xcQ8HLWo7hkxx9xca5vXy5zpggVQuDNSqi CwdMrqzav5KEK16cG1dKh9ztzUh5rrjq72e0e2VgRANZnblKtdeNRO/s7h8gbngkkxKnZUEQ6 motFJlHpK1G+gG4XA0G3V+WYJ9l4oUjdCp24a2tV2MFg+ZUpoM= 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 21:45:09 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/power/supply/bq2415x_charger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/bq2415x_charger.c index c4770a94cc8e..8385e02e1634 100644 --- a/drivers/power/supply/bq2415x_charger.c +++ b/drivers/power/supply/bq2415x_charger.c @@ -914,16 +914,12 @@ static void bq2415x_timer_work(struct work_struct *work) } boost = bq2415x_exec_command(bq, BQ2415X_BOOST_MODE_STATUS); - if (boost < 0) { - bq2415x_timer_error(bq, "Unknown error"); - return; - } + if (boost < 0) + goto report_timer_error; error = bq2415x_exec_command(bq, BQ2415X_FAULT_STATUS); - if (error < 0) { - bq2415x_timer_error(bq, "Unknown error"); - return; - } + if (error < 0) + goto report_timer_error; if (boost) { switch (error) { @@ -992,6 +988,10 @@ static void bq2415x_timer_work(struct work_struct *work) } schedule_delayed_work(&bq->work, BQ2415X_TIMER_TIMEOUT * HZ); + return; + +report_timer_error: + bq2415x_timer_error(bq, "Unknown error"); } /**** power supply interface code ****/ -- 2.14.3