alpha: remove remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

The change in pci-iommu,c should be safe as arena has not been assigned
when we get to this point.

Some were within #if 0 blocks, have changed them and left the blocks
as they appear to be debugging infrastructure.

A #define FN __FUNCTION__ was removed and occurances of FN were replaced
with __func__ as well.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 922143ea1cdb..828449cd2636 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -80,7 +80,7 @@ io7_get_irq_ctl(unsigned int irq, struct io7 **pio7)
         if (!(io7 = marvel_find_io7(pid))) {
                 printk(KERN_ERR 
                        "%s for nonexistent io7 -- vec %x, pid %d\n",
-                       __FUNCTION__, irq, pid);
+                       __func__, irq, pid);
                 return NULL;
         }
 
@@ -90,7 +90,7 @@ io7_get_irq_ctl(unsigned int irq, struct io7 **pio7)
         if (irq >= 0x180) {
                 printk(KERN_ERR 
                        "%s for invalid irq -- pid %d adjusted irq %x\n",
-                       __FUNCTION__, pid, irq);
+                       __func__, pid, irq);
                 return NULL;
         }
 
@@ -110,8 +110,8 @@ io7_enable_irq(unsigned int irq)
 
         ctl = io7_get_irq_ctl(irq, &io7);
         if (!ctl || !io7) {
-                printk(KERN_ERR "%s: get_ctl failed for irq %x\n", 
-                       __FUNCTION__, irq);
+                printk(KERN_ERR "%s: get_ctl failed for irq %x\n",
+                       __func__, irq);
                 return;
         }
                 
@@ -130,8 +130,8 @@ io7_disable_irq(unsigned int irq)
 
         ctl = io7_get_irq_ctl(irq, &io7);
         if (!ctl || !io7) {
-                printk(KERN_ERR "%s: get_ctl failed for irq %x\n", 
-                       __FUNCTION__, irq);
+                printk(KERN_ERR "%s: get_ctl failed for irq %x\n",
+                       __func__, irq);
                 return;
         }