Commit 5df72bf3 authored by Harvey Harrison's avatar Harvey Harrison Committed by Paul Mackerras

powerpc: Replace __FUNCTION__ with __func__

__FUNCTION__ is gcc-specific, use __func__

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 542ad5d4
...@@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight) ...@@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight)
return -EINVAL; return -EINVAL;
pr_debug("%s: current_entitled = %lu, current_weight = %u\n", 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", 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); retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
return retval; return retval;
...@@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight) ...@@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)
return -EINVAL; return -EINVAL;
pr_debug("%s: current_entitled = %lu, current_weight = %u\n", 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", 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); rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);
return rc; return rc;
......
...@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr) ...@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr)
npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN | npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |
__GFP_NORETRY | __GFP_NOMEMALLOC); __GFP_NORETRY | __GFP_NOMEMALLOC);
if (!npa) { 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); free_page(addr);
break; break;
} }
...@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr) ...@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr)
} }
if ((rc = plpar_page_set_loaned(__pa(addr)))) { 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); spin_unlock(&cmm_lock);
free_page(addr); free_page(addr);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment