diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-28 17:34:39 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-04-28 12:14:27 -0400 |
commit | bb09a954b64c61b691c095e0a20708265b5bc2bc (patch) | |
tree | 2f048790608989d756c60c825db61e2e38287cbd /arch | |
parent | f2ce89f30ede4cb32fa8f9aaec884087069c81ba (diff) |
[MIPS] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/au1000/common/power.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/signal-common.h | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-pnx8550.c | 4 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-reset.c | 2 | ||||
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 2 | ||||
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index 54047d69b820..ca4b3dea3c92 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | #define DEBUG 1 | 48 | #define DEBUG 1 |
49 | #ifdef DEBUG | 49 | #ifdef DEBUG |
50 | # define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) | 50 | # define DPRINTK(fmt, args...) printk("%s: " fmt, __func__, ## args) |
51 | #else | 51 | #else |
52 | # define DPRINTK(fmt, args...) | 52 | # define DPRINTK(fmt, args...) |
53 | #endif | 53 | #endif |
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h index c0faabd52010..6c8e8c4246f7 100644 --- a/arch/mips/kernel/signal-common.h +++ b/arch/mips/kernel/signal-common.h | |||
@@ -14,7 +14,7 @@ | |||
14 | /* #define DEBUG_SIG */ | 14 | /* #define DEBUG_SIG */ |
15 | 15 | ||
16 | #ifdef DEBUG_SIG | 16 | #ifdef DEBUG_SIG |
17 | # define DEBUGP(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ##args) | 17 | # define DEBUGP(fmt, args...) printk("%s: " fmt, __func__, ##args) |
18 | #else | 18 | #else |
19 | # define DEBUGP(fmt, args...) | 19 | # define DEBUGP(fmt, args...) |
20 | #endif | 20 | #endif |
diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c index d61064652498..0e160d9f07c3 100644 --- a/arch/mips/pci/ops-pnx8550.c +++ b/arch/mips/pci/ops-pnx8550.c | |||
@@ -90,14 +90,14 @@ config_access(unsigned int pci_cmd, struct pci_bus *bus, unsigned int devfn, int | |||
90 | 90 | ||
91 | loops--; | 91 | loops--; |
92 | if (loops == 0) { | 92 | if (loops == 0) { |
93 | printk("%s : Arbiter Locked.\n", __FUNCTION__); | 93 | printk("%s : Arbiter Locked.\n", __func__); |
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | clear_status(); | 97 | clear_status(); |
98 | if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_IOW)) { | 98 | if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_IOW)) { |
99 | printk("%s timeout (GPPM_CTRL=%X) ioaddr %lX pci_cmd %X\n", | 99 | printk("%s timeout (GPPM_CTRL=%X) ioaddr %lX pci_cmd %X\n", |
100 | __FUNCTION__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr, | 100 | __func__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr, |
101 | pci_cmd); | 101 | pci_cmd); |
102 | } | 102 | } |
103 | 103 | ||
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c index 624bbdbff2a8..b6cab089561e 100644 --- a/arch/mips/sgi-ip32/ip32-reset.c +++ b/arch/mips/sgi-ip32/ip32-reset.c | |||
@@ -142,7 +142,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id) | |||
142 | reg_c = CMOS_READ(RTC_INTR_FLAGS); | 142 | reg_c = CMOS_READ(RTC_INTR_FLAGS); |
143 | if (!(reg_c & RTC_IRQF)) { | 143 | if (!(reg_c & RTC_IRQF)) { |
144 | printk(KERN_WARNING | 144 | printk(KERN_WARNING |
145 | "%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__); | 145 | "%s: RTC IRQ without RTC_IRQF\n", __func__); |
146 | } | 146 | } |
147 | /* Wait until interrupt goes away */ | 147 | /* Wait until interrupt goes away */ |
148 | disable_irq(MACEISA_RTC_IRQ); | 148 | disable_irq(MACEISA_RTC_IRQ); |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index 3f808b629242..6d31f2a98abf 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
@@ -173,7 +173,7 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = | |||
173 | { \ | 173 | { \ |
174 | char tmp[100]; \ | 174 | char tmp[100]; \ |
175 | sprintf( tmp, str ); \ | 175 | sprintf( tmp, str ); \ |
176 | printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ | 176 | printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \ |
177 | } | 177 | } |
178 | #else | 178 | #else |
179 | #define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...) | 179 | #define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...) |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index e466e5e711d8..2203c77b2ce2 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -93,7 +93,7 @@ static const u32 toshiba_rbtx4927_setup_debug_flag = | |||
93 | { \ | 93 | { \ |
94 | char tmp[100]; \ | 94 | char tmp[100]; \ |
95 | sprintf( tmp, str ); \ | 95 | sprintf( tmp, str ); \ |
96 | printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ | 96 | printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \ |
97 | } | 97 | } |
98 | #else | 98 | #else |
99 | #define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag, str...) | 99 | #define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag, str...) |