diff options
| author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2011-04-19 10:08:31 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-04-20 11:12:02 +0200 |
| commit | 2812cbfb40d8b249c229762addb831b04135825f (patch) | |
| tree | f0641ee760f6a81beebe482411bb0fcdc2f7d6f7 /drivers | |
| parent | 811d7bc7a461a26ff20dd73ed3ada259ffdd8532 (diff) | |
android: vibrator: dont directly access ktime_t members
Use ktime helper functions for converting ktime values
ST-Ericsson ID: 329353
Change-Id: Ice95ff739c7d8df9288088a9c2b8813b168e6057
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21191
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/android/ste_timed_vibra.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/android/ste_timed_vibra.c b/drivers/staging/android/ste_timed_vibra.c index 069ab38082c..4cb84eb25e7 100644 --- a/drivers/staging/android/ste_timed_vibra.c +++ b/drivers/staging/android/ste_timed_vibra.c @@ -213,11 +213,12 @@ static enum hrtimer_restart vibra_timer_expired(struct hrtimer *hrtimer) static int vibra_get_time(struct timed_output_dev *tdev) { struct vibra_info *vinfo = dev_get_drvdata(tdev->dev); + u32 ms; if (hrtimer_active(&vinfo->vibra_timer)) { ktime_t remain = hrtimer_get_remaining(&vinfo->vibra_timer); - return remain.tv.sec*1000 + remain.tv.nsec/1000000 + - vinfo->time_passed; + ms = (u32) ktime_to_ms(remain); + return ms + vinfo->time_passed; } else return 0; } |