diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-28 17:21:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-01 05:43:10 -0400 |
commit | 1d18a602e9116dc89da6750dcbda44bb1eb82b8e (patch) | |
tree | aa2a45c273c87e7c1b1cec666dbc32d8ceacd90a /arch/ppc | |
parent | e48b1b452ff630288c930fd8e0c2d808bc15f7ad (diff) |
[POWERPC] ppc: Replace remaining __FUNCTION__ occurrences
__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>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 4 | ||||
-rw-r--r-- | arch/ppc/platforms/radstone_ppc7d.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 11b0aa6ca97..1d4b49ad0d7 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_id) | |||
520 | #ifdef CONFIG_USE_MDIO | 520 | #ifdef CONFIG_USE_MDIO |
521 | fec_enet_mii(dev); | 521 | fec_enet_mii(dev); |
522 | #else | 522 | #else |
523 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__); | 523 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__); |
524 | #endif /* CONFIG_USE_MDIO */ | 524 | #endif /* CONFIG_USE_MDIO */ |
525 | } | 525 | } |
526 | 526 | ||
@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id) | |||
1441 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ | 1441 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ |
1442 | } | 1442 | } |
1443 | #else | 1443 | #else |
1444 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); | 1444 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__); |
1445 | #endif /* CONFIG_USE_MDIO */ | 1445 | #endif /* CONFIG_USE_MDIO */ |
1446 | 1446 | ||
1447 | #ifndef CONFIG_RPXCLASSIC | 1447 | #ifndef CONFIG_RPXCLASSIC |
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c index 44d4398a36f..fc928a26609 100644 --- a/arch/ppc/platforms/radstone_ppc7d.c +++ b/arch/ppc/platforms/radstone_ppc7d.c | |||
@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void) | |||
512 | { | 512 | { |
513 | int irq; | 513 | int irq; |
514 | 514 | ||
515 | pr_debug("%s\n", __FUNCTION__); | 515 | pr_debug("%s\n", __func__); |
516 | i8259_init(0, 0); | 516 | i8259_init(0, 0); |
517 | mv64360_init_irq(); | 517 | mv64360_init_irq(); |
518 | 518 | ||
@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct pci_dev *dev, unsigned char idsel, | |||
569 | }; | 569 | }; |
570 | const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4; | 570 | const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4; |
571 | 571 | ||
572 | pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__, | 572 | pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__, |
573 | dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin); | 573 | dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin); |
574 | 574 | ||
575 | return PCI_IRQ_TABLE_LOOKUP; | 575 | return PCI_IRQ_TABLE_LOOKUP; |
@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void) | |||
1300 | u32 data; | 1300 | u32 data; |
1301 | u8 data8; | 1301 | u8 data8; |
1302 | 1302 | ||
1303 | pr_debug("%s: enter\n", __FUNCTION__); | 1303 | pr_debug("%s: enter\n", __func__); |
1304 | 1304 | ||
1305 | /* Wait for debugger? */ | 1305 | /* Wait for debugger? */ |
1306 | if (ppc7d_wait_debugger) { | 1306 | if (ppc7d_wait_debugger) { |
@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void) | |||
1333 | ppc_md.set_rtc_time = ppc7d_set_rtc_time; | 1333 | ppc_md.set_rtc_time = ppc7d_set_rtc_time; |
1334 | ppc_md.get_rtc_time = ppc7d_get_rtc_time; | 1334 | ppc_md.get_rtc_time = ppc7d_get_rtc_time; |
1335 | 1335 | ||
1336 | pr_debug("%s: exit\n", __FUNCTION__); | 1336 | pr_debug("%s: exit\n", __func__); |
1337 | } | 1337 | } |
1338 | 1338 | ||
1339 | /* Called from machine_init(), early, before any of the __init functions | 1339 | /* Called from machine_init(), early, before any of the __init functions |