summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-02 00:20:30 +0200
committerArjan van de Ven <arjan@linux.intel.com>2008-09-06 06:35:21 +0200
commit6c644eaeb2e000a08f0e20653b0835bb90a93e4a (patch)
tree7e052e50871ba2beb630f95036244cc7e1a19ea1 /drivers/s390
parenthrtimer: convert kvm-ia64 to the new hrtimer apis (diff)
downloadlinux-6c644eaeb2e000a08f0e20653b0835bb90a93e4a.tar.xz
linux-6c644eaeb2e000a08f0e20653b0835bb90a93e4a.zip
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/s390')
-rw-r--r--drivers/s390/crypto/ap_bus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 62b6b55230d0..6f02f1e674d4 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;
}