[linux-yocto] [PATCH 02/10] staging: android: vsoc: use hrtimer_init_sleeper_on_stack()

[Paul Gortmaker]

From: Sebastian Andrzej Siewior <bigeasy at linutronix.de>

commit 3f1b0eab8fb3d592ae2da62a62b0522b365781e0 from linux-rt-devel.

This is an update to v2 of "hrtimer: consolidate hrtimer_init() +
hrtimer_init_sleeper() calls" which also converts
hrtimer_init_on_stack() + hrtimer_init_sleeper() in the vsoc.c driver.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
---
 drivers/staging/android/vsoc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c
index 806beda1040b..6c7f666c0e33 100644
--- a/drivers/staging/android/vsoc.c
+++ b/drivers/staging/android/vsoc.c
@@ -438,12 +438,10 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg)
 
 		if (!timespec_valid(&ts))
 			return -EINVAL;
-		hrtimer_init_on_stack(&to->timer, CLOCK_MONOTONIC,
-				      HRTIMER_MODE_ABS);
+		hrtimer_init_sleeper_on_stack(to, CLOCK_MONOTONIC,
+					      HRTIMER_MODE_ABS, current);
 		hrtimer_set_expires_range_ns(&to->timer, timespec_to_ktime(ts),
 					     current->timer_slack_ns);
-
-		hrtimer_init_sleeper(to, current);
 	}
 
 	while (1) {
-- 
2.15.0