[PATCH RFC 8/8] clock device: convert timer_settime

[Richard Cochran]

This patch lets the timer_settime system call use dynamic clock devices.

Signed-off-by: Richard Cochran <richard.coch...@omicron.at>
---
 include/linux/clockdevice.h |    3 +++
 kernel/posix-timers.c       |   12 +++++++++---
 kernel/time/clockdevice.c   |   20 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/include/linux/clockdevice.h b/include/linux/clockdevice.h
index b56debb..d3589a0 100644
--- a/include/linux/clockdevice.h
+++ b/include/linux/clockdevice.h
@@ -110,5 +110,8 @@ int clock_device_timer_create(struct clock_device *clk, 
struct k_itimer *kit);
 int clock_device_timer_delete(struct clock_device *clk, struct k_itimer *kit);
 void clock_device_timer_gettime(struct clock_device *clk, struct k_itimer *kit,
                                struct itimerspec *tsp);
+int clock_device_timer_settime(struct clock_device *clk,
+                              struct k_itimer *kit, int flags,
+                              struct itimerspec *tsp, struct itimerspec *old);
 
 #endif
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index d00ff73..b09e37e 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -817,6 +817,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, 
flags,
                const struct itimerspec __user *, new_setting,
                struct itimerspec __user *, old_setting)
 {
+       struct clock_device *clk_dev;
        struct k_itimer *timr;
        struct itimerspec new_spec, old_spec;
        int error = 0;
@@ -837,9 +838,14 @@ retry:
        if (!timr)
                return -EINVAL;
 
-       error = CLOCK_DISPATCH(timr->it_clock, timer_set,
-                              (timr, flags, &new_spec, rtn));
-
+       clk_dev = clockid_to_clock_device(timr->it_clock);
+       if (clk_dev)
+               error = clock_device_timer_settime(clk_dev, timr,
+                                                  flags, &new_spec, rtn);
+       else {
+               error = CLOCK_DISPATCH(timr->it_clock, timer_set,
+                                      (timr, flags, &new_spec, rtn));
+       }
        unlock_timer(timr, flag);
        if (error == TIMER_RETRY) {
                rtn = NULL;     // We already got the old time...
diff --git a/kernel/time/clockdevice.c b/kernel/time/clockdevice.c
index 0f6f913..3345c3a 100644
--- a/kernel/time/clockdevice.c
+++ b/kernel/time/clockdevice.c
@@ -314,3 +314,23 @@ void clock_device_timer_gettime(struct clock_device *clk, 
struct k_itimer *kit,
 out:
        mutex_unlock(&clk->mux);
 }
+
+int clock_device_timer_settime(struct clock_device *clk,
+                              struct k_itimer *kit, int flags,
+                              struct itimerspec *tsp, struct itimerspec *old)
+{
+       int err;
+
+       mutex_lock(&clk->mux);
+
+       if (clk->zombie)
+               err = -ENODEV;
+       else if (!clk->ops->timer_settime)
+               err = -EOPNOTSUPP;
+       else
+               err = clk->ops->timer_settime(clk->priv, kit, flags, tsp, old);
+
+       mutex_unlock(&clk->mux);
+
+       return err;
+}
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-api" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html