Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5df72bf3f7345a84f5ef274bf72a4546caf3ad02

Authored by Harvey Harrison
Committed by Paul Mackerras
1 parent 542ad5d4cc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/powerpc/kernel/lparcfg.c
Diff comments   View file @ 5df72bf
... ... @@ -510,10 +510,10 @@
510 510 return -EINVAL;
511 511  
512 512 pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
513   - __FUNCTION__, ppp_data.entitlement, ppp_data.weight);
  513 + __func__, ppp_data.entitlement, ppp_data.weight);
514 514  
515 515 pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
516   - __FUNCTION__, new_entitled, new_weight);
  516 + __func__, new_entitled, new_weight);
517 517  
518 518 retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
519 519 return retval;
520 520  
... ... @@ -556,10 +556,10 @@
556 556 return -EINVAL;
557 557  
558 558 pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
559   - __FUNCTION__, mpp_data.entitled_mem, mpp_data.mem_weight);
  559 + __func__, mpp_data.entitled_mem, mpp_data.mem_weight);
560 560  
561 561 pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
562   - __FUNCTION__, new_entitled, new_weight);
  562 + __func__, new_entitled, new_weight);
563 563  
564 564 rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);
565 565 return rc;
arch/powerpc/platforms/pseries/cmm.c
Diff comments   View file @ 5df72bf
... ... @@ -121,7 +121,7 @@
121 121 npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |
122 122 __GFP_NORETRY | __GFP_NOMEMALLOC);
123 123 if (!npa) {
124   - pr_info("%s: Can not allocate new page list\n", __FUNCTION__);
  124 + pr_info("%s: Can not allocate new page list\n", __func__);
125 125 free_page(addr);
126 126 break;
127 127 }
... ... @@ -138,7 +138,7 @@
138 138 }
139 139  
140 140 if ((rc = plpar_page_set_loaned(__pa(addr)))) {
141   - pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc);
  141 + pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc);
142 142 spin_unlock(&cmm_lock);
143 143 free_page(addr);
144 144 break;