Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[POWERPC] ppc: Replace remaining __FUNCTION__ occurrences

Browse Source 
__FUNCTION__ is gcc-specific, use __func__

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>
This commit is contained in:
Harvey Harrison 2008-03-29 08:21:07 +11:00 committed by Paul Mackerras
parent e48b1b452f
commit 1d18a602e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ppc/8xx_io/fec.c
View File

@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_id)
#ifdef CONFIG_USE_MDIO #ifdef CONFIG_USE_MDIO
fec_enet_mii(dev); fec_enet_mii(dev);
#else #else
printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__); printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__);
#endif /* CONFIG_USE_MDIO */ #endif /* CONFIG_USE_MDIO */
} }
@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id)
fecp->fec_ecntrl = ecntrl; /* restore old settings */ fecp->fec_ecntrl = ecntrl; /* restore old settings */
} }
#else #else
printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__);
#endif /* CONFIG_USE_MDIO */ #endif /* CONFIG_USE_MDIO */
#ifndef CONFIG_RPXCLASSIC #ifndef CONFIG_RPXCLASSIC

8
arch/ppc/platforms/radstone_ppc7d.c
View File

@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)
{ {
int irq; int irq;
pr_debug("%s\n", __FUNCTION__); pr_debug("%s\n", __func__);
i8259_init(0, 0); i8259_init(0, 0);
mv64360_init_irq(); mv64360_init_irq();
@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct pci_dev *dev, unsigned char idsel,
}; };
const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4; const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__, pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__,
dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin); dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
return PCI_IRQ_TABLE_LOOKUP; return PCI_IRQ_TABLE_LOOKUP;
@ -1300,7 +1300,7 @@ static void ppc7d_init2(void)
u32 data; u32 data;
u8 data8; u8 data8;
pr_debug("%s: enter\n", __FUNCTION__); pr_debug("%s: enter\n", __func__);
/* Wait for debugger? */ /* Wait for debugger? */
if (ppc7d_wait_debugger) { if (ppc7d_wait_debugger) {
@ -1333,7 +1333,7 @@ static void ppc7d_init2(void)
ppc_md.set_rtc_time = ppc7d_set_rtc_time; ppc_md.set_rtc_time = ppc7d_set_rtc_time;
ppc_md.get_rtc_time = ppc7d_get_rtc_time; ppc_md.get_rtc_time = ppc7d_get_rtc_time;
pr_debug("%s: exit\n", __FUNCTION__); pr_debug("%s: exit\n", __func__);
} }
/* Called from machine_init(), early, before any of the __init functions /* Called from machine_init(), early, before any of the __init functions