mips: replace remaining FUNCTION occurances

PATCH New Harvey Harrison 1 participant 1 message Mar 3, 2008 MIPS

lore

Share & tools

lore

Harvey Harrison

author

2008-03-03 18:32 UTC #0 lore raw

PATCH 1/1 mips: replace remaining __FUNCTION__ occurances

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by Harvey Harrison <[email protected]>

---
 arch/mips/au1000/common/power.c                    |    2 +-
 arch/mips/kernel/signal-common.h                   |    2 +-
 arch/mips/pci/ops-pnx8550.c                        |    4 ++--
 arch/mips/sgi-ip32/ip32-reset.c                    |    2 +-
 .../tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c |    2 +-
 .../toshiba_rbtx4927/toshiba_rbtx4927_setup.c      |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

arch/mips/au1000/common/power.c +1 -1

index 54047d6..ca4b3de 100644
@@ -47,7 +47,7 @@
 
 #define DEBUG 1
 #ifdef DEBUG
-#  define DPRINTK(fmt, args...)	printk("%s: " fmt, __FUNCTION__ , ## args)
+#  define DPRINTK(fmt, args...)	printk("%s: " fmt, __func__, ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif

arch/mips/kernel/signal-common.h +1 -1

index c0faabd..6c8e8c4 100644
@@ -14,7 +14,7 @@
 /* #define DEBUG_SIG */
 
 #ifdef DEBUG_SIG
-#  define DEBUGP(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ##args)
+#  define DEBUGP(fmt, args...) printk("%s: " fmt, __func__, ##args)
 #else
 #  define DEBUGP(fmt, args...)
 #endif

arch/mips/pci/ops-pnx8550.c +2 -2

index d610646..0e160d9 100644
@@ -90,14 +90,14 @@ config_access(unsigned int pci_cmd, struct pci_bus *bus, unsigned int devfn, int
 
 		loops--;
 		if (loops == 0) {
-			printk("%s : Arbiter Locked.\n", __FUNCTION__);
+			printk("%s : Arbiter Locked.\n", __func__);
 		}
 	}
 
 	clear_status();
 	if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_IOW)) {
 		printk("%s timeout (GPPM_CTRL=%X) ioaddr %lX pci_cmd %X\n",
-		       __FUNCTION__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
+		       __func__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
 		       pci_cmd);
 	}

arch/mips/sgi-ip32/ip32-reset.c +1 -1

index 624bbdb..b6cab08 100644
@@ -142,7 +142,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
 	reg_c = CMOS_READ(RTC_INTR_FLAGS);
 	if (!(reg_c & RTC_IRQF)) {
 		printk(KERN_WARNING
-			"%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__);
+			"%s: RTC IRQ without RTC_IRQF\n", __func__);
 	}
 	/* Wait until interrupt goes away */
 	disable_irq(MACEISA_RTC_IRQ);

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +1 -1

index 3f808b6..6d31f2a 100644
@@ -173,7 +173,7 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
         { \
            char tmp[100]; \
            sprintf( tmp, str ); \
-           printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
+           printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \
         }
 #else
 #define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...)

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +1 -1

index e466e5e..2203c77 100644
@@ -93,7 +93,7 @@ static const u32 toshiba_rbtx4927_setup_debug_flag =
         { \
            char tmp[100]; \
            sprintf( tmp, str ); \
-           printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
+           printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \
         }
 #else
 #define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag, str...)

Signature · 1 line

1.5.4.3.500.g83a2c