| Message ID | 20210923153339.746654947@linutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | hrtimers: Cleanup hrtimer_forward() [ab]use | expand |
Hi, On Thu, Sep 23, 2021 at 06:04:28PM +0200, Thomas Gleixner wrote: > hrtimer_forward_now() provides the same functionality as the open coded > hrtimer_forward() invocation. Prepares for removal of hrtimer_forward() > from the public interfaces. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: Sebastian Reichel <sre@kernel.org> > Cc: linux-pm@vger.kernel.org > --- Thanks, queued to power-supply's for-next branch. -- Sebastian > drivers/power/reset/ltc2952-poweroff.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > --- a/drivers/power/reset/ltc2952-poweroff.c > +++ b/drivers/power/reset/ltc2952-poweroff.c > @@ -94,7 +94,6 @@ static struct ltc2952_poweroff *ltc2952_ > */ > static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer) > { > - ktime_t now; > int state; > struct ltc2952_poweroff *data = to_ltc2952(timer, timer_wde); > > @@ -104,8 +103,7 @@ static enum hrtimer_restart ltc2952_powe > state = gpiod_get_value(data->gpio_watchdog); > gpiod_set_value(data->gpio_watchdog, !state); > > - now = hrtimer_cb_get_time(timer); > - hrtimer_forward(timer, now, data->wde_interval); > + hrtimer_forward_now(timer, data->wde_interval); > > return HRTIMER_RESTART; > } >
--- a/drivers/power/reset/ltc2952-poweroff.c +++ b/drivers/power/reset/ltc2952-poweroff.c @@ -94,7 +94,6 @@ static struct ltc2952_poweroff *ltc2952_ */ static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer) { - ktime_t now; int state; struct ltc2952_poweroff *data = to_ltc2952(timer, timer_wde); @@ -104,8 +103,7 @@ static enum hrtimer_restart ltc2952_powe state = gpiod_get_value(data->gpio_watchdog); gpiod_set_value(data->gpio_watchdog, !state); - now = hrtimer_cb_get_time(timer); - hrtimer_forward(timer, now, data->wde_interval); + hrtimer_forward_now(timer, data->wde_interval); return HRTIMER_RESTART; }
hrtimer_forward_now() provides the same functionality as the open coded hrtimer_forward() invocation. Prepares for removal of hrtimer_forward() from the public interfaces. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Sebastian Reichel <sre@kernel.org> Cc: linux-pm@vger.kernel.org --- drivers/power/reset/ltc2952-poweroff.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)