lkml.org 
[lkml]   [2017]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] bq2415x_charger: Use common error handling code in bq2415x_timer_work()
Date
From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
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
\
 
 \ /
  Last update: 2017-10-30 21:51    [W:0.059 / U:0.332 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site