From: Frans Klaver <frans.klaver@xsens.com>
To: Sebastian Reichel <sre@kernel.org>
Cc: "Frans Klaver" <frans.klaver@xsens.com>,
"Dmitry Eremin-Solenikov" <dbaryshkov@gmail.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Grant Likely" <grant.likely@linaro.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"René Moll" <linux@r-moll.nl>,
"Guenter Roeck" <linux@roeck-us.net>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org
Subject: [PATCH 08/13] power: reset: ltc2952: cleanup control flow in poweroff_handler
Date: Wed, 22 Oct 2014 16:31:05 +0200 [thread overview]
Message-ID: <1413988270-28092-9-git-send-email-frans.klaver@xsens.com> (raw)
In-Reply-To: <1413988270-28092-1-git-send-email-frans.klaver@xsens.com>
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>
---
drivers/power/reset/ltc2952-poweroff.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index af3cb6e..70d8e3a 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -153,29 +153,21 @@ ltc2952_poweroff_timer_trigger(struct hrtimer *timer)
*/
static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
{
- int ret;
struct ltc2952_poweroff *data = dev_id;
- if (data->kernel_panic)
- goto irq_ok;
-
- if (hrtimer_active(&data->timer_wde)) {
+ if (data->kernel_panic || hrtimer_active(&data->timer_wde)) {
/* shutdown is already triggered, nothing to do any more */
- goto irq_ok;
+ return IRQ_HANDLED;
}
if (!hrtimer_active(&data->timer_trigger)) {
- ret = hrtimer_start(&data->timer_trigger, data->trigger_delay,
- HRTIMER_MODE_REL);
-
- if (ret)
+ if (hrtimer_start(&data->timer_trigger, data->trigger_delay,
+ HRTIMER_MODE_REL))
dev_err(data->dev, "unable to start the wait timer\n");
} else {
- ret = hrtimer_cancel(&data->timer_trigger);
+ hrtimer_cancel(&data->timer_trigger);
/* omitting return value check, timer should have been valid */
}
-
-irq_ok:
return IRQ_HANDLED;
}
--
2.1.0
next prev parent reply other threads:[~2014-10-22 14:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-22 14:30 [PATCH 00/13] ltc2952 modernization and new functionality Frans Klaver
2014-10-22 14:30 ` [PATCH 01/13] power: reset: ltc2952: prefer devm_kzalloc over kzalloc Frans Klaver
2014-10-22 14:30 ` [PATCH 02/13] power: reset: ltc2952: prefer devm_request_irq over request_irq Frans Klaver
2014-10-22 14:31 ` [PATCH 03/13] power: reset: ltc2952: unroll gpio_desc array Frans Klaver
2014-10-22 14:31 ` [PATCH 04/13] power: reset: ltc2952: prefer devm_gpiod_get over gpiod_get Frans Klaver
2014-10-22 14:31 ` [PATCH 05/13] power: reset: ltc2952: reduce dependency on global variables Frans Klaver
2014-10-22 14:31 ` [PATCH 06/13] power: reset: ltc2952: remove global variable poweroff_panic Frans Klaver
2014-10-22 14:31 ` [PATCH 07/13] power: reset: ltc2952: drop empty suspend/resume functions Frans Klaver
2014-10-22 14:31 ` Frans Klaver [this message]
2014-10-22 14:31 ` [PATCH 09/13] power: reset: ltc2952: fix C++ style function pointers Frans Klaver
2014-10-22 14:31 ` [PATCH 10/13] power: reset: ltc2952: disable timers in _remove Frans Klaver
2014-10-22 14:31 ` [PATCH 11/13] power: reset: ltc2952: check trigger value before starting timer Frans Klaver
2014-10-22 14:31 ` [PATCH 12/13] power: reset: ltc2952: make trigger input optional Frans Klaver
2014-10-23 8:44 ` Frans Klaver
2014-10-22 14:31 ` [PATCH 13/13] power: reset: ltc2952: document optional trigger behavior Frans Klaver
2014-12-22 9:04 ` [PATCH 00/13] ltc2952 modernization and new functionality Frans Klaver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413988270-28092-9-git-send-email-frans.klaver@xsens.com \
--to=frans.klaver@xsens.com \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@r-moll.nl \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).