Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d18a602 authored by Harvey Harrison's avatar Harvey Harrison Committed by Paul Mackerras
Browse files

[POWERPC] ppc: Replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e48b1b45

arch/ppc/8xx_io/fec.c

+2 −2
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_id) 
#ifdef	CONFIG_USE_MDIO

			fec_enet_mii(dev);

#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 */

		}
@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id) 
		fecp->fec_ecntrl = ecntrl;	/* restore old settings */

	}

#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 */



#ifndef CONFIG_RPXCLASSIC

arch/ppc/platforms/radstone_ppc7d.c

+4 −4
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void) 
{

	int irq;



	pr_debug("%s\n", __FUNCTION__);

	pr_debug("%s\n", __func__);

	i8259_init(0, 0);

	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;



	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);



	return PCI_IRQ_TABLE_LOOKUP;
@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void) 
	u32 data;

	u8 data8;



	pr_debug("%s: enter\n", __FUNCTION__);

	pr_debug("%s: enter\n", __func__);



	/* Wait for 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.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