3 files changed, 18 insertions, 18 deletions

diff --git a/arch/powerpc/oprofile/cell/spu_task_sync.c b/arch/powerpc/oprofile/cell/spu_task_sync.c
index 257b13cb18af..2a9b4a049329 100644
--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
@@ -68,7 +68,7 @@ static struct cached_info *get_cached_info(struct spu *the_spu, int spu_num)
         if (spu_num >= num_spu_nodes) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Invalid index %d into spu info cache\n",
-                       __FUNCTION__, __LINE__, spu_num);
+                       __func__, __LINE__, spu_num);
                 ret_info = NULL;
                 goto out;
         }
@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu, unsigned long objectId)
         if (!info) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: create vma_map failed\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 retval = -ENOMEM;
                 goto err_alloc;
         }
@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu, unsigned long objectId)
         if (!new_map) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: create vma_map failed\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 retval = -ENOMEM;
                 goto err_alloc;
         }
@@ -171,7 +171,7 @@ static int release_cached_info(int spu_index)
                         printk(KERN_ERR "SPU_PROF: "
                                 "%s, line %d: "
                                 "Invalid index %d into spu info cache\n",
-                                __FUNCTION__, __LINE__, spu_index);
+                                __func__, __LINE__, spu_index);
                         goto out;
                 }
                 end = spu_index + 1;
@@ -273,7 +273,7 @@ fail_no_image_cookie:
 
         printk(KERN_ERR "SPU_PROF: "
                 "%s, line %d: Cannot find dcookie for SPU binary\n",
-                __FUNCTION__, __LINE__);
+                __func__, __LINE__);
         goto out;
 }
 
@@ -467,7 +467,7 @@ int spu_sync_stop(void)
         if (ret) {
                 printk(KERN_ERR "SPU_PROF: "
                         "%s, line %d: spu_switch_event_unregister returned %d\n",
-                        __FUNCTION__, __LINE__, ret);
+                        __func__, __LINE__, ret);
                 goto out;
         }
 
diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c
index 9a932177e70e..fff66662d021 100644
--- a/arch/powerpc/oprofile/cell/vma_map.c
+++ b/arch/powerpc/oprofile/cell/vma_map.c
@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map *map, unsigned int vma,
                 kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
         if (!new) {
                 printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 vma_map_free(map);
                 return NULL;
         }
@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
         if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Unexpected e_ident parsing SPU ELF\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 goto fail;
         }
         if (ehdr.e_machine != EM_SPU) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Unexpected e_machine parsing SPU ELF\n",
-                       __FUNCTION__,  __LINE__);
+                       __func__,  __LINE__);
                 goto fail;
         }
         if (ehdr.e_type != ET_EXEC) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Unexpected e_type parsing SPU ELF\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 goto fail;
         }
         phdr_start = spu_elf_start + ehdr.e_phoff;
@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
         if (overlay_tbl_offset < 0) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Error finding SPU overlay table\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 goto fail;
         }
         ovly_table = spu_elf_start + overlay_tbl_offset;
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index 9eed1f68fcab..5ff4de3eb3be 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 node)
                  * failure to stop OProfile.
                  */
                 printk(KERN_WARNING "%s: rtas returned: %d\n",
-                       __FUNCTION__, ret);
+                       __func__, ret);
 }
 
 static int pm_rtas_activate_signals(u32 node, u32 count)
@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32 node, u32 count)
 
                 if (unlikely(ret)) {
                         printk(KERN_WARNING "%s: rtas returned: %d\n",
-                               __FUNCTION__, ret);
+                               __func__, ret);
                         return -EIO;
                 }
         }
@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_counter_config *ctr,
                 if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                         printk(KERN_ERR
                                "%s: rtas token ibm,cbe-spu-perftools unknown\n",
-                               __FUNCTION__);
+                               __func__);
                         return -EIO;
                 }
         }
@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_counter_config *ctr,
         if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                 printk(KERN_ERR
                        "%s: rtas token ibm,cbe-perftools unknown\n",
-                       __FUNCTION__);
+                       __func__);
                 return -EIO;
         }
 
@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profiling(u32 node)
 
         if (unlikely(ret)) {
                 printk(KERN_WARNING "%s: rtas returned: %d\n",
-                       __FUNCTION__, ret);
+                       __func__, ret);
                 return -EIO;
         }
 
@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct op_counter_config *ctr)
                 if (unlikely(ret != 0)) {
                         printk(KERN_ERR
                                "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
-                               __FUNCTION__, ret);
+                               __func__, ret);
                         rtas_error = -EIO;
                         goto out;
                 }
@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void)
                 if (unlikely(rtn_value != 0)) {
                         printk(KERN_ERR
                                "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
-                               __FUNCTION__, rtn_value);
+                               __func__, rtn_value);
                 }
 
                 /* Deactivate the signals */