4 files changed, 6 insertions, 17 deletions

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index f85db3a69b4a..2930d1e81a05 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -611,7 +611,6 @@ static int __init create_spu(void *data)
         int ret;
         static int number;
         unsigned long flags;
-        struct timespec ts;
 
         ret = -ENOMEM;
         spu = kzalloc(sizeof (*spu), GFP_KERNEL);
@@ -652,8 +651,7 @@ static int __init create_spu(void *data)
         mutex_unlock(&spu_full_list_mutex);
 
         spu->stats.util_state = SPU_UTIL_IDLE_LOADED;
-        ktime_get_ts(&ts);
-        spu->stats.tstamp = timespec_to_ns(&ts);
+        spu->stats.tstamp = ktime_get_ns();
 
         INIT_LIST_HEAD(&spu->aff_list);
 
@@ -676,7 +674,6 @@ static const char *spu_state_names[] = {
 static unsigned long long spu_acct_time(struct spu *spu,
                 enum spu_utilization_state state)
 {
-        struct timespec ts;
         unsigned long long time = spu->stats.times[state];
 
         /*
@@ -684,10 +681,8 @@ static unsigned long long spu_acct_time(struct spu *spu,
          * statistics are not updated.  Apply the time delta from the
          * last recorded state of the spu.
          */
-        if (spu->stats.util_state == state) {
-                ktime_get_ts(&ts);
-                time += timespec_to_ns(&ts) - spu->stats.tstamp;
-        }
+        if (spu->stats.util_state == state)
+                time += ktime_get_ns() - spu->stats.tstamp;
 
         return time / NSEC_PER_MSEC;
 }
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 9c6790d17eda..3b4152faeb1f 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -36,7 +36,6 @@ atomic_t nr_spu_contexts = ATOMIC_INIT(0);
 struct spu_context *alloc_spu_context(struct spu_gang *gang)
 {
         struct spu_context *ctx;
-        struct timespec ts;
 
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx)
@@ -67,8 +66,7 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
         __spu_update_sched_info(ctx);
         spu_set_timeslice(ctx);
         ctx->stats.util_state = SPU_UTIL_IDLE_LOADED;
-        ktime_get_ts(&ts);
-        ctx->stats.tstamp = timespec_to_ns(&ts);
+        ctx->stats.tstamp = ktime_get_ns();
 
         atomic_inc(&nr_spu_contexts);
         goto out;
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 90986923a53a..d966bbe58b8f 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -2338,7 +2338,6 @@ static const char *ctx_state_names[] = {
 static unsigned long long spufs_acct_time(struct spu_context *ctx,
                 enum spu_utilization_state state)
 {
-        struct timespec ts;
         unsigned long long time = ctx->stats.times[state];
 
         /*
@@ -2351,8 +2350,7 @@ static unsigned long long spufs_acct_time(struct spu_context *ctx,
          * of the spu context.
          */
         if (ctx->spu && ctx->stats.util_state == state) {
-                ktime_get_ts(&ts);
-                time += timespec_to_ns(&ts) - ctx->stats.tstamp;
+                time += ktime_get_ns() - ctx->stats.tstamp;
         }
 
         return time / NSEC_PER_MSEC;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 4a0a64fe25df..998f632e7cce 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1039,13 +1039,11 @@ void spuctx_switch_state(struct spu_context *ctx,
 {
         unsigned long long curtime;
         signed long long delta;
-        struct timespec ts;
         struct spu *spu;
         enum spu_utilization_state old_state;
         int node;
 
-        ktime_get_ts(&ts);
-        curtime = timespec_to_ns(&ts);
+        curtime = ktime_get_ns();
         delta = curtime - ctx->stats.tstamp;
 
         WARN_ON(!mutex_is_locked(&ctx->state_mutex));