[POWERPC] spufs: remove superfluous SPU_STATE_SAVED assignments

unbind_context already sets the context state to SPU_STATE_SAVED, thus
the spu_deactivate callers don't need to do it again.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 28c718c..dd89aa7 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -197,10 +197,8 @@ void spu_acquire_saved(struct spu_context *ctx)
        up_read(&ctx->state_sema);
        down_write(&ctx->state_sema);
 
-       if (ctx->state == SPU_STATE_RUNNABLE) {
+       if (ctx->state == SPU_STATE_RUNNABLE)
                spu_deactivate(ctx);
-               ctx->state = SPU_STATE_SAVED;
-       }
 
        downgrade_write(&ctx->state_sema);
 }

diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index bd6fe4b..6599cba 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -315,7 +315,6 @@ void spu_yield(struct spu_context *ctx)
                                pr_debug("%s: yielding SPU %d NODE %d\n",
                                         __FUNCTION__, spu->number, spu->node);
                                spu_deactivate(ctx);
-                               ctx->state = SPU_STATE_SAVED;
                                need_yield = 1;
                        } else {
                                spu->prio = MAX_PRIO;