powerpc: cell: Use ktime_get_ns()

Replace the ever recurring:
	ts = ktime_get_ts();
	ns = timespec_to_ns(&ts);
with
	ns = ktime_get_ns();

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index f85db3a69b4a0fdc73c882d6218b3e9bd45b7307..2930d1e81a05c0f960e08e344ee4ff6601a3bbf4 100644 (file)
--- 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 9c6790d17eda17e7dc87cbaf67f8f8d5d59db044..3b4152faeb1fc43e53ea5c56cdade97647e7c1fb 100644 (file)
--- 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 90986923a53aae1ff2233409f4cbf25da398db4d..d966bbe58b8f368979154edb3ead64f735c5bb2b 100644 (file)
--- 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 4a0a64fe25df274a16051b668a3497b4632e8bf1..998f632e7cce4cebaa727afa4c35840bad109d3e 100644 (file)
--- 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));