powerpc: Replace __FUNCTION__ with __func__

__FUNCTION__ is gcc-specific, use __func__

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index b3eef30b5131a0d1eaf43551ae0d0aa2ccda6d92..d051e8cbcd0373138f4c88cd59538067e73bbec1 100644 (file)
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight)
                return -EINVAL;
 
        pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
-                __FUNCTION__, ppp_data.entitlement, ppp_data.weight);
+                __func__, ppp_data.entitlement, ppp_data.weight);
 
        pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
-                __FUNCTION__, new_entitled, new_weight);
+                __func__, new_entitled, new_weight);
 
        retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
        return retval;
@@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)
                return -EINVAL;
 
        pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
-                __FUNCTION__, mpp_data.entitled_mem, mpp_data.mem_weight);
+                __func__, mpp_data.entitled_mem, mpp_data.mem_weight);
 
        pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
-                __FUNCTION__, new_entitled, new_weight);
+                __func__, new_entitled, new_weight);
 
        rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);
        return rc;

diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index 38fe32a7cc7007b2c3a24a5ed688db7c1a9d7dd2..5cd4d276162085f43177ac56d7effb162dcdb090 100644 (file)
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr)
                        npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |
                                                                       __GFP_NORETRY | __GFP_NOMEMALLOC);
                        if (!npa) {
-                               pr_info("%s: Can not allocate new page list\n", __FUNCTION__);
+                               pr_info("%s: Can not allocate new page list\n", __func__);
                                free_page(addr);
                                break;
                        }
@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr)
                }
 
                if ((rc = plpar_page_set_loaned(__pa(addr)))) {
-                       pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc);
+                       pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc);
                        spin_unlock(&cmm_lock);
                        free_page(addr);
                        break;