diff options
Diffstat (limited to 'arch/powerpc/platforms/cell/spufs/run.c')
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/run.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index cac69e116776..5986d08115af 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
@@ -98,7 +98,7 @@ static int spu_setup_isolated(struct spu_context *ctx) | |||
98 | != MFC_CNTL_PURGE_DMA_COMPLETE) { | 98 | != MFC_CNTL_PURGE_DMA_COMPLETE) { |
99 | if (time_after(jiffies, timeout)) { | 99 | if (time_after(jiffies, timeout)) { |
100 | printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n", | 100 | printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n", |
101 | __FUNCTION__); | 101 | __func__); |
102 | ret = -EIO; | 102 | ret = -EIO; |
103 | goto out; | 103 | goto out; |
104 | } | 104 | } |
@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu_context *ctx) | |||
124 | status_loading) { | 124 | status_loading) { |
125 | if (time_after(jiffies, timeout)) { | 125 | if (time_after(jiffies, timeout)) { |
126 | printk(KERN_ERR "%s: timeout waiting for loader\n", | 126 | printk(KERN_ERR "%s: timeout waiting for loader\n", |
127 | __FUNCTION__); | 127 | __func__); |
128 | ret = -EIO; | 128 | ret = -EIO; |
129 | goto out_drop_priv; | 129 | goto out_drop_priv; |
130 | } | 130 | } |
@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu_context *ctx) | |||
134 | if (!(status & SPU_STATUS_RUNNING)) { | 134 | if (!(status & SPU_STATUS_RUNNING)) { |
135 | /* If isolated LOAD has failed: run SPU, we will get a stop-and | 135 | /* If isolated LOAD has failed: run SPU, we will get a stop-and |
136 | * signal later. */ | 136 | * signal later. */ |
137 | pr_debug("%s: isolated LOAD failed\n", __FUNCTION__); | 137 | pr_debug("%s: isolated LOAD failed\n", __func__); |
138 | ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE); | 138 | ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE); |
139 | ret = -EACCES; | 139 | ret = -EACCES; |
140 | goto out_drop_priv; | 140 | goto out_drop_priv; |
@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu_context *ctx) | |||
142 | 142 | ||
143 | if (!(status & SPU_STATUS_ISOLATED_STATE)) { | 143 | if (!(status & SPU_STATUS_ISOLATED_STATE)) { |
144 | /* This isn't allowed by the CBEA, but check anyway */ | 144 | /* This isn't allowed by the CBEA, but check anyway */ |
145 | pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__); | 145 | pr_debug("%s: SPU fell out of isolated mode?\n", __func__); |
146 | ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP); | 146 | ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP); |
147 | ret = -EINVAL; | 147 | ret = -EINVAL; |
148 | goto out_drop_priv; | 148 | goto out_drop_priv; |
@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct spu_context *ctx, long *spu_ret, | |||
282 | break; | 282 | break; |
283 | default: | 283 | default: |
284 | printk(KERN_WARNING "%s: unexpected return code %ld\n", | 284 | printk(KERN_WARNING "%s: unexpected return code %ld\n", |
285 | __FUNCTION__, *spu_ret); | 285 | __func__, *spu_ret); |
286 | ret = 0; | 286 | ret = 0; |
287 | } | 287 | } |
288 | return ret; | 288 | return ret; |