leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: reset: ltc2952: cleanup control flow in poweroff_handler

Browse Source 
ltc2952_poweroff_handler uses gotos to return from the function. Since
we don't do cleanups exiting this function, just return IRQ_HANDLED on
the spot and be done with it.

While at it, remove the variable 'ret'. It was never used very much.

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Frans Klaver 2015-01-14 09:15:41 +01:00 committed by Sebastian Reichel
parent 0428c40d4c
commit 5c3faad29b
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/power/reset/ltc2952-poweroff.c
View File

@ -153,29 +153,21 @@ ltc2952_poweroff_timer_trigger(struct hrtimer *timer)
*/ */
static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id) static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
{ {
int ret;
struct ltc2952_poweroff *data = dev_id; struct ltc2952_poweroff *data = dev_id;
if (data->kernel_panic) if (data->kernel_panic || hrtimer_active(&data->timer_wde)) {
goto irq_ok;
if (hrtimer_active(&data->timer_wde)) {
/* shutdown is already triggered, nothing to do any more */ /* shutdown is already triggered, nothing to do any more */
goto irq_ok; return IRQ_HANDLED;
} }
if (!hrtimer_active(&data->timer_trigger)) { if (!hrtimer_active(&data->timer_trigger)) {
ret = hrtimer_start(&data->timer_trigger, data->trigger_delay, if (hrtimer_start(&data->timer_trigger, data->trigger_delay,
HRTIMER_MODE_REL); HRTIMER_MODE_REL))
if (ret)
dev_err(data->dev, "unable to start the wait timer\n"); dev_err(data->dev, "unable to start the wait timer\n");
} else { } else {
ret = hrtimer_cancel(&data->timer_trigger); hrtimer_cancel(&data->timer_trigger);
/* omitting return value check, timer should have been valid */ /* omitting return value check, timer should have been valid */
} }
irq_ok:
return IRQ_HANDLED; return IRQ_HANDLED;
} }