diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 15:25:20 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-05 21:35:23 -0700 |
| commit | 5c73a7d0411999e3cb3c6d64225450813738ae25 (patch) | |
| tree | 609874b77d5098e154010175a3d0eb73603eacd8 | |
| parent | 6c644eaeb2e000a08f0e20653b0835bb90a93e4a (diff) | |
| download | op-kernel-dev-5c73a7d0411999e3cb3c6d64225450813738ae25.zip op-kernel-dev-5c73a7d0411999e3cb3c6d64225450813738ae25.tar.gz | |
hrtimer: convert sound/ to the new hrtimer apis
In order to be able to do range hrtimers we need to use accessor functions
to the "expire" member of the hrtimer struct.
This patch converts sound/ to these accessors.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
| -rw-r--r-- | sound/drivers/pcsp/pcsp_lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c index e341f3f..1f42e40 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c @@ -34,7 +34,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) chip->thalf = 0; if (!atomic_read(&chip->timer_active)) return HRTIMER_NORESTART; - hrtimer_forward(&chip->timer, chip->timer.expires, + hrtimer_forward(&chip->timer, hrtimer_get_expires(&chip->timer), ktime_set(0, chip->ns_rem)); return HRTIMER_RESTART; } @@ -118,7 +118,8 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) chip->ns_rem = PCSP_PERIOD_NS(); ns = (chip->thalf ? PCSP_CALC_NS(timer_cnt) : chip->ns_rem); chip->ns_rem -= ns; - hrtimer_forward(&chip->timer, chip->timer.expires, ktime_set(0, ns)); + hrtimer_forward(&chip->timer, hrtimer_get_expires(&chip->timer), + ktime_set(0, ns)); return HRTIMER_RESTART; exit_nr_unlock2: |
