diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 15:20:30 -0700 |
---|---|---|
committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-05 21:35:21 -0700 |
commit | 6c644eaeb2e000a08f0e20653b0835bb90a93e4a (patch) | |
tree | 7e052e50871ba2beb630f95036244cc7e1a19ea1 /drivers | |
parent | 18dd36af0010dd70c8634cdca0f99b47b5036c60 (diff) | |
download | kernel_samsung_crespo-6c644eaeb2e000a08f0e20653b0835bb90a93e4a.zip kernel_samsung_crespo-6c644eaeb2e000a08f0e20653b0835bb90a93e4a.tar.gz kernel_samsung_crespo-6c644eaeb2e000a08f0e20653b0835bb90a93e4a.tar.bz2 |
hrtimer: convert s390 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 s390 to these accessors.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/crypto/ap_bus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 62b6b55..6f02f1e 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -659,9 +659,9 @@ static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf, hr_time = ktime_set(0, poll_timeout); if (!hrtimer_is_queued(&ap_poll_timer) || - !hrtimer_forward(&ap_poll_timer, ap_poll_timer.expires, hr_time)) { - ap_poll_timer.expires = hr_time; - hrtimer_start(&ap_poll_timer, hr_time, HRTIMER_MODE_ABS); + !hrtimer_forward(&ap_poll_timer, hrtimer_get_expires(&ap_poll_timer), hr_time)) { + hrtimer_set_expires(&ap_poll_timer, hr_time); + hrtimer_start_expires(&ap_poll_timer, HRTIMER_MODE_ABS); } return count; } |