> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxxxxxxx>
Better fix would be to display separate messages; user is probably
interested in what failed...
Pavel
> ---
> 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 ****/
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
