Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / cell / spufs / run.c

diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 2619f14546a3dd620046c2f80a6145c8d89f0bbf..96bf7c2b86fcf61ca6d241e9d222853ed7ba883b 100644 (file)
--- 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)
                        != MFC_CNTL_PURGE_DMA_COMPLETE) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
-                                       __FUNCTION__);
+                                       __func__);
                        ret = -EIO;
                        goto out;
                }
@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
                                status_loading) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout waiting for loader\n",
-                                       __FUNCTION__);
+                                       __func__);
                        ret = -EIO;
                        goto out_drop_priv;
                }
@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
        if (!(status & SPU_STATUS_RUNNING)) {
                /* If isolated LOAD has failed: run SPU, we will get a stop-and
                 * signal later. */
-               pr_debug("%s: isolated LOAD failed\n", __FUNCTION__);
+               pr_debug("%s: isolated LOAD failed\n", __func__);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
                ret = -EACCES;
                goto out_drop_priv;
@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
 
        if (!(status & SPU_STATUS_ISOLATED_STATE)) {
                /* This isn't allowed by the CBEA, but check anyway */
-               pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__);
+               pr_debug("%s: SPU fell out of isolated mode?\n", __func__);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
                ret = -EINVAL;
                goto out_drop_priv;
@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct spu_context *ctx, long *spu_ret,
                break;
        default:
                printk(KERN_WARNING "%s: unexpected return code %ld\n",
-                       __FUNCTION__, *spu_ret);
+                       __func__, *spu_ret);
                ret = 0;
        }
        return ret;