diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-14 17:09:20 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-04-30 11:47:17 -0400 |
commit | d8818257d3befce6ce7da4c09112654914c3fd58 (patch) | |
tree | 3b8a02b15ffea2440aa571766eeeb1752dec7893 | |
parent | ce992369cf29a8762b46338756ef5aba35774981 (diff) |
power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
The return value of hrtimer_start() tells whether the timer was
inactive or active already when hrtimer_start() was called.
The code emits a bogus warning if the timer was active already
claiming that the timer could not be started.
Remove it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Frans Klaver <frans.klaver@xsens.com>
Cc: "René Moll" <linux@r-moll.nl>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-pm@vger.kernel.org
Acked-by: Frans Klaver <frans.klaver@xsens.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r-- | drivers/power/reset/ltc2952-poweroff.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c index 7ef193b6f7fe..1e08195551fe 100644 --- a/drivers/power/reset/ltc2952-poweroff.c +++ b/drivers/power/reset/ltc2952-poweroff.c | |||
@@ -120,18 +120,7 @@ static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer) | |||
120 | 120 | ||
121 | static void ltc2952_poweroff_start_wde(struct ltc2952_poweroff *data) | 121 | static void ltc2952_poweroff_start_wde(struct ltc2952_poweroff *data) |
122 | { | 122 | { |
123 | if (hrtimer_start(&data->timer_wde, data->wde_interval, | 123 | hrtimer_start(&data->timer_wde, data->wde_interval, HRTIMER_MODE_REL); |
124 | HRTIMER_MODE_REL)) { | ||
125 | /* | ||
126 | * The device will not toggle the watchdog reset, | ||
127 | * thus shut down is only safe if the PowerPath controller | ||
128 | * has a long enough time-off before triggering a hardware | ||
129 | * power-off. | ||
130 | * | ||
131 | * Only sending a warning as the system will power-off anyway | ||
132 | */ | ||
133 | dev_err(data->dev, "unable to start the timer\n"); | ||
134 | } | ||
135 | } | 124 | } |
136 | 125 | ||
137 | static enum hrtimer_restart | 126 | static enum hrtimer_restart |
@@ -165,9 +154,8 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id) | |||
165 | } | 154 | } |
166 | 155 | ||
167 | if (gpiod_get_value(data->gpio_trigger)) { | 156 | if (gpiod_get_value(data->gpio_trigger)) { |
168 | if (hrtimer_start(&data->timer_trigger, data->trigger_delay, | 157 | hrtimer_start(&data->timer_trigger, data->trigger_delay, |
169 | HRTIMER_MODE_REL)) | 158 | HRTIMER_MODE_REL); |
170 | dev_err(data->dev, "unable to start the wait timer\n"); | ||
171 | } else { | 159 | } else { |
172 | hrtimer_cancel(&data->timer_trigger); | 160 | hrtimer_cancel(&data->timer_trigger); |
173 | /* omitting return value check, timer should have been valid */ | 161 | /* omitting return value check, timer should have been valid */ |