41 files changed, 46 insertions, 46 deletions

diff --git a/arch/powerpc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c
index 41f0617f3d3a..549baba5948f 100644
--- a/arch/powerpc/math-emu/fabs.c
+++ b/arch/powerpc/math-emu/fabs.c
@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)
         frD[1] = frB[1];
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c
index fc8836488b64..7befbbf2c332 100644
--- a/arch/powerpc/math-emu/fadd.c
+++ b/arch/powerpc/math-emu/fadd.c
@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c
index 93025b6c8f3c..2b346b38b480 100644
--- a/arch/powerpc/math-emu/fadds.c
+++ b/arch/powerpc/math-emu/fadds.c
@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c
index 4efac394b4cb..36d689044c63 100644
--- a/arch/powerpc/math-emu/fcmpo.c
+++ b/arch/powerpc/math-emu/fcmpo.c
@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
+        printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c
index b7e33176e618..53d93894f2a6 100644
--- a/arch/powerpc/math-emu/fcmpu.c
+++ b/arch/powerpc/math-emu/fcmpu.c
@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, void *frB)
         long cmp;
 
 #ifdef DEBUG
-        printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
+        printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c
index 3b3c98b840cf..fcd7a95e021d 100644
--- a/arch/powerpc/math-emu/fctiw.c
+++ b/arch/powerpc/math-emu/fctiw.c
@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)
         frD[1] = r;
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c
index 7717eb6fcfb6..1514d59e146e 100644
--- a/arch/powerpc/math-emu/fctiwz.c
+++ b/arch/powerpc/math-emu/fctiwz.c
@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)
         __FPU_FPSCR = fpscr;
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c
index f2fba825b2d0..18a20fe396b0 100644
--- a/arch/powerpc/math-emu/fdiv.c
+++ b/arch/powerpc/math-emu/fdiv.c
@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB)
         if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                 ret |= EFLAG_VXZDZ;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXZDZ raised\n", __func__);
 #endif
         }
         if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
                 ret |= EFLAG_VXIDI;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXIDI raised\n", __func__);
 #endif
         }
 
diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c
index b971196e3175..24feed689c35 100644
--- a/arch/powerpc/math-emu/fdivs.c
+++ b/arch/powerpc/math-emu/fdivs.c
@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB)
         if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                 ret |= EFLAG_VXZDZ;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXZDZ raised\n", __func__);
 #endif
         }
         if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
                 ret |= EFLAG_VXIDI;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXIDI raised\n", __func__);
 #endif
         }
 
diff --git a/arch/powerpc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c
index 0a1dbce793e9..dedb465fdc68 100644
--- a/arch/powerpc/math-emu/fmadd.c
+++ b/arch/powerpc/math-emu/fmadd.c
@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c
index 0f70bba9445e..6bbb56d5502c 100644
--- a/arch/powerpc/math-emu/fmadds.c
+++ b/arch/powerpc/math-emu/fmadds.c
@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmr.c b/arch/powerpc/math-emu/fmr.c
index 28df700c0c7e..bd55384b8196 100644
--- a/arch/powerpc/math-emu/fmr.c
+++ b/arch/powerpc/math-emu/fmr.c
@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)
         frD[1] = frB[1];
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c
index 203fd48a6fec..f311e2c7e67e 100644
--- a/arch/powerpc/math-emu/fmsub.c
+++ b/arch/powerpc/math-emu/fmsub.c
@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c
index 8ce68624c189..81a716d3ee2e 100644
--- a/arch/powerpc/math-emu/fmsubs.c
+++ b/arch/powerpc/math-emu/fmsubs.c
@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c
index 66c7e79aae2e..2f3d32784a04 100644
--- a/arch/powerpc/math-emu/fmul.c
+++ b/arch/powerpc/math-emu/fmul.c
@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c
index 26bc4278271c..962b5883f784 100644
--- a/arch/powerpc/math-emu/fmuls.c
+++ b/arch/powerpc/math-emu/fmuls.c
@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnabs.c b/arch/powerpc/math-emu/fnabs.c
index c6b913d179e0..a7d34f3d9499 100644
--- a/arch/powerpc/math-emu/fnabs.c
+++ b/arch/powerpc/math-emu/fnabs.c
@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)
         frD[1] = frB[1];
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fneg.c b/arch/powerpc/math-emu/fneg.c
index fe9a98deff69..1e988cd9c6cc 100644
--- a/arch/powerpc/math-emu/fneg.c
+++ b/arch/powerpc/math-emu/fneg.c
@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)
         frD[1] = frB[1];
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c
index 7f312276d920..8cf7827c4fb5 100644
--- a/arch/powerpc/math-emu/fnmadd.c
+++ b/arch/powerpc/math-emu/fnmadd.c
@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c
index 65454c9c70bc..f1c4f0f0d807 100644
--- a/arch/powerpc/math-emu/fnmadds.c
+++ b/arch/powerpc/math-emu/fnmadds.c
@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c
index f1ca7482b5f0..98944e6e2601 100644
--- a/arch/powerpc/math-emu/fnmsub.c
+++ b/arch/powerpc/math-emu/fnmsub.c
@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c
index 5c9a09a87dc7..b20f4eb63fb9 100644
--- a/arch/powerpc/math-emu/fnmsubs.c
+++ b/arch/powerpc/math-emu/fnmsubs.c
@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fres.c b/arch/powerpc/math-emu/fres.c
index ec11e46d20af..10ecbd08b79e 100644
--- a/arch/powerpc/math-emu/fres.c
+++ b/arch/powerpc/math-emu/fres.c
@@ -6,7 +6,7 @@ int
 fres(void *frD, void *frB)
 {
 #ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p\n", __func__, frD, frB);
 #endif
         return -ENOSYS;
 }
diff --git a/arch/powerpc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c
index d879b2a3d0c9..724ccbc0468e 100644
--- a/arch/powerpc/math-emu/frsp.c
+++ b/arch/powerpc/math-emu/frsp.c
@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)
         FP_DECL_D(B);
 
 #ifdef DEBUG
-        printk("%s: D %p, B %p\n", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p\n", __func__, frD, frB);
 #endif
 
         __FP_UNPACK_D(B, frB);
diff --git a/arch/powerpc/math-emu/frsqrte.c b/arch/powerpc/math-emu/frsqrte.c
index a11ae1829850..1d0a3a0fd0e6 100644
--- a/arch/powerpc/math-emu/frsqrte.c
+++ b/arch/powerpc/math-emu/frsqrte.c
@@ -6,7 +6,7 @@ int
 frsqrte(void *frD, void *frB)
 {
 #ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p\n", __func__, frD, frB);
 #endif
         return 0;
 }
diff --git a/arch/powerpc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c
index e36e6e72819a..ecb5f28eb1f3 100644
--- a/arch/powerpc/math-emu/fsel.c
+++ b/arch/powerpc/math-emu/fsel.c
@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32 *frC)
         FP_DECL_D(A);
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c
index 6f8319f64a8a..38ec2b752e9d 100644
--- a/arch/powerpc/math-emu/fsqrt.c
+++ b/arch/powerpc/math-emu/fsqrt.c
@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p %p %p\n", __func__, frD, frB);
 #endif
 
         __FP_UNPACK_D(B, frB);
diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c
index 3b2b1cf55c12..335263e06ee5 100644
--- a/arch/powerpc/math-emu/fsqrts.c
+++ b/arch/powerpc/math-emu/fsqrts.c
@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p %p %p\n", __func__, frD, frB);
 #endif
 
         __FP_UNPACK_D(B, frB);
diff --git a/arch/powerpc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c
index 956679042bb2..208d20fc52a5 100644
--- a/arch/powerpc/math-emu/fsub.c
+++ b/arch/powerpc/math-emu/fsub.c
@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c
index 3428117dfe8c..0e61b808c44b 100644
--- a/arch/powerpc/math-emu/fsubs.c
+++ b/arch/powerpc/math-emu/fsubs.c
@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)
         int ret = 0;
 
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
         __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c
index 7d38101c329b..6ec90b57c61a 100644
--- a/arch/powerpc/math-emu/lfd.c
+++ b/arch/powerpc/math-emu/lfd.c
@@ -11,7 +11,7 @@ lfd(void *frD, void *ea)
         if (copy_from_user(frD, ea, sizeof(double)))
                 return -EFAULT;
 #ifdef DEBUG
-        printk("%s: D %p, ea %p: ", __FUNCTION__, frD, ea);
+        printk("%s: D %p, ea %p: ", __func__, frD, ea);
         dump_double(frD);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c
index c86dee3d7655..6f18ebe3a7ff 100644
--- a/arch/powerpc/math-emu/lfs.c
+++ b/arch/powerpc/math-emu/lfs.c
@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)
         float f;
 
 #ifdef DEBUG
-        printk("%s: D %p, ea %p\n", __FUNCTION__, frD, ea);
+        printk("%s: D %p, ea %p\n", __func__, frD, ea);
 #endif
 
         if (copy_from_user(&f, ea, sizeof(float)))
diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c
index 106dd912914b..41ba247faf89 100644
--- a/arch/powerpc/math-emu/mcrfs.c
+++ b/arch/powerpc/math-emu/mcrfs.c
@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
         u32 value, clear;
 
 #ifdef DEBUG
-        printk("%s: %p (%08x) %d %d\n", __FUNCTION__, ccr, *ccr, crfD, crfS);
+        printk("%s: %p (%08x) %d %d\n", __func__, ccr, *ccr, crfD, crfS);
 #endif
 
         clear = 15 << ((7 - crfS) << 2);
@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
         *ccr |= (value << ((7 - crfD) << 2));
 
 #ifdef DEBUG
-        printk("CR: %08x\n", __FUNCTION__, *ccr);
+        printk("CR: %08x\n", __func__, *ccr);
 #endif
 
         return 0;
diff --git a/arch/powerpc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c
index f477c9170e75..b0e2106e6eb6 100644
--- a/arch/powerpc/math-emu/mffs.c
+++ b/arch/powerpc/math-emu/mffs.c
@@ -10,7 +10,7 @@ mffs(u32 *frD)
         frD[1] = __FPU_FPSCR;
 
 #ifdef DEBUG
-        printk("%s: frD %p: %08x.%08x\n", __FUNCTION__, frD, frD[0], frD[1]);
+        printk("%s: frD %p: %08x.%08x\n", __func__, frD, frD[0], frD[1]);
 #endif
 
         return 0;
diff --git a/arch/powerpc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c
index 99bfd80f4af3..d3062350ea21 100644
--- a/arch/powerpc/math-emu/mtfsb0.c
+++ b/arch/powerpc/math-emu/mtfsb0.c
@@ -11,7 +11,7 @@ mtfsb0(int crbD)
                 __FPU_FPSCR &= ~(1 << (31 - crbD));
 
 #ifdef DEBUG
-        printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
+        printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
 #endif
 
         return 0;
diff --git a/arch/powerpc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c
index 3d9e7ed92d2b..2e948704b56e 100644
--- a/arch/powerpc/math-emu/mtfsb1.c
+++ b/arch/powerpc/math-emu/mtfsb1.c
@@ -11,7 +11,7 @@ mtfsb1(int crbD)
                 __FPU_FPSCR |= (1 << (31 - crbD));
 
 #ifdef DEBUG
-        printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
+        printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
 #endif
 
         return 0;
diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c
index d70cf714994c..48014d8e3af1 100644
--- a/arch/powerpc/math-emu/mtfsf.c
+++ b/arch/powerpc/math-emu/mtfsf.c
@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)
         __FPU_FPSCR |= (frB[1] & mask);
 
 #ifdef DEBUG
-        printk("%s: %02x %p: %08lx\n", __FUNCTION__, FM, frB, __FPU_FPSCR);
+        printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
 #endif
 
         return 0;
diff --git a/arch/powerpc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c
index 71df854baa7e..031e20093549 100644
--- a/arch/powerpc/math-emu/mtfsfi.c
+++ b/arch/powerpc/math-emu/mtfsfi.c
@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int IMM)
         __FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
 
 #ifdef DEBUG
-        printk("%s: %d %x: %08lx\n", __FUNCTION__, crfD, IMM, __FPU_FPSCR);
+        printk("%s: %d %x: %08lx\n", __func__, crfD, IMM, __FPU_FPSCR);
 #endif
 
         return 0;
diff --git a/arch/powerpc/math-emu/stfd.c b/arch/powerpc/math-emu/stfd.c
index 3f8c2558a9e8..33a165c8df0f 100644
--- a/arch/powerpc/math-emu/stfd.c
+++ b/arch/powerpc/math-emu/stfd.c
@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)
 {
 #if 0
 #ifdef DEBUG
-        printk("%s: S %p, ea %p: ", __FUNCTION__, frS, ea);
+        printk("%s: S %p, ea %p: ", __func__, frS, ea);
         dump_double(frS);
         printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/stfiwx.c b/arch/powerpc/math-emu/stfiwx.c
index 95caaeec6a08..f15a35f67e2c 100644
--- a/arch/powerpc/math-emu/stfiwx.c
+++ b/arch/powerpc/math-emu/stfiwx.c
@@ -6,7 +6,7 @@ int
 stfiwx(u32 *frS, void *ea)
 {
 #ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frS, ea);
+        printk("%s: %p %p\n", __func__, frS, ea);
 #endif
 
         if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
diff --git a/arch/powerpc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c
index e87ca23c6dc3..8689aa48ef69 100644
--- a/arch/powerpc/math-emu/stfs.c
+++ b/arch/powerpc/math-emu/stfs.c
@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)
         int err;
 
 #ifdef DEBUG
-        printk("%s: S %p, ea %p\n", __FUNCTION__, frS, ea);
+        printk("%s: S %p, ea %p\n", __func__, frS, ea);
 #endif
 
         __FP_UNPACK_D(A, frS);