This patch converts __FUNCTION__ to __func__, since __func__ is standard.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3943 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

14 files changed, 33 insertions, 33 deletions

diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c
index f0d88dca43..fab6d81f8b 100644
--- a/src/mainboard/amd/db800/mainboard.c
+++ b/src/mainboard/amd/db800/mainboard.c
@@ -23,8 +23,8 @@
 
 static void init(struct device *dev)
 {
-	printk_debug("AMD DB800 ENTER %s\n", __FUNCTION__);
-	printk_debug("AMD DB800 EXIT %s\n", __FUNCTION__);
+	printk_debug("AMD DB800 ENTER %s\n", __func__);
+	printk_debug("AMD DB800 EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index 5a33efe756..ffaffc5841 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -210,12 +210,12 @@ void dbm690t_enable(device_t dev)
 	/* TOP_MEM: the top of DRAM below 4G */
 	msr = rdmsr(TOP_MEM);
 	printk_info("%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
-		    __FUNCTION__, msr.lo, msr.hi);
+		    __func__, msr.lo, msr.hi);
 
 	/* TOP_MEM2: the top of DRAM above 4G */
 	msr2 = rdmsr(TOP_MEM2);
 	printk_info("%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
-		    __FUNCTION__, msr2.lo, msr2.hi);
+		    __func__, msr2.lo, msr2.hi);
 
 	switch (msr.lo) {
 	case 0x10000000:	/* 256M system memory */
@@ -237,7 +237,7 @@ void dbm690t_enable(device_t dev)
 
 	uma_memory_start = msr.lo - uma_memory_size;	/* TOP_MEM1 */
 	printk_info("%s: uma size 0x%08x, memory start 0x%08x\n",
-		    __FUNCTION__, uma_memory_size, uma_memory_start);
+		    __func__, uma_memory_size, uma_memory_start);
 
 	/* TODO: TOP_MEM2 */
 #else
diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c
index 5ad685eedd..89537fda42 100644
--- a/src/mainboard/amd/norwich/mainboard.c
+++ b/src/mainboard/amd/norwich/mainboard.c
@@ -23,8 +23,8 @@
 
 static void init(struct device *dev)
 {
-	printk_debug("Norwich ENTER %s\n", __FUNCTION__);
-	printk_debug("Norwich EXIT %s\n", __FUNCTION__);
+	printk_debug("Norwich ENTER %s\n", __func__);
+	printk_debug("Norwich EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index c49dca85f9..f8706b4219 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -282,12 +282,12 @@ void pistachio_enable(device_t dev)
 	/* TOP_MEM: the top of DRAM below 4G */
 	msr = rdmsr(TOP_MEM);
 	printk_info("%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
-		    __FUNCTION__, msr.lo, msr.hi);
+		    __func__, msr.lo, msr.hi);
 
 	/* TOP_MEM2: the top of DRAM above 4G */
 	msr2 = rdmsr(TOP_MEM2);
 	printk_info("%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
-		    __FUNCTION__, msr2.lo, msr2.hi);
+		    __func__, msr2.lo, msr2.hi);
 
 	switch (msr.lo) {
 	case 0x10000000:	/* 256M system memory */
@@ -309,7 +309,7 @@ void pistachio_enable(device_t dev)
 
 	uma_memory_start = msr.lo - uma_memory_size;	/* TOP_MEM1 */
 	printk_info("%s: uma size 0x%08x, memory start 0x%08x\n",
-		    __FUNCTION__, uma_memory_size, uma_memory_start);
+		    __func__, uma_memory_size, uma_memory_start);
 
 	/* TODO: TOP_MEM2 */
 #else
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 47ba2897d0..84c9708b31 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -16,11 +16,11 @@ static void init(struct device *dev) {
 	if (mainboard->nicirq)
 		nicirq = mainboard->nicirq;
 
-	printk_debug("AMD RUMBA ENTER %s\n", __FUNCTION__);
+	printk_debug("AMD RUMBA ENTER %s\n", __func__);
 
 	if (nicirq) {
 		printk_debug("%s (%x,%x)SET PCI interrupt line to %d\n", 
-			__FUNCTION__, bus, devfn, nicirq);
+			__func__, bus, devfn, nicirq);
 		nic = dev_find_slot(bus, devfn);
 		if (! nic){
 			printk_err("Could not find NIC\n");
@@ -28,7 +28,7 @@ static void init(struct device *dev) {
 			pci_write_config8(nic, PCI_INTERRUPT_LINE, nicirq);
 		}
 	}
-	printk_debug("AMD RUMBA EXIT %s\n", __FUNCTION__);
+	printk_debug("AMD RUMBA EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index 8fa2af5f91..37ad988cd8 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -40,11 +40,11 @@ static void init_gpio()
 static void init(struct device *dev)
 {
 	// BOARD-SPECIFIC INIT
-	printk_debug("ARTECGROUP DBE61 ENTER %s\n", __FUNCTION__);
+	printk_debug("ARTECGROUP DBE61 ENTER %s\n", __func__);
 
 	init_gpio();
 
-	printk_debug("ARTECGROUP DBE61 EXIT %s\n", __FUNCTION__);
+	printk_debug("ARTECGROUP DBE61 EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 8e537958ae..f898218c77 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -44,7 +44,7 @@ static void enable_dev(struct device *dev) {
 	 */
 
 	/* currently, nothing in the device to use, so ignore it. */
-	printk_err("digital logic msm586 seg ENTER %s\n", __FUNCTION__);
+	printk_err("digital logic msm586 seg ENTER %s\n", __func__);
 
 
 	/* from fuctory bios */
@@ -93,7 +93,7 @@ static void enable_dev(struct device *dev) {
 	mmcr->sysarb.prictl = 0xc0000f0f;
 	/* this is bios setting, depends on sysarb above */
 	mmcr->hostbridge.ctl = 0x108;
-	printk_err("digital logic msm586 seg EXIT %s\n", __FUNCTION__);
+	printk_err("digital logic msm586 seg EXIT %s\n", __func__);
 
 	/* pio */
 	mmcr->pio.data31_16 = 0xffbf;
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index 75c8c34bf6..ffe95b234b 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -23,8 +23,8 @@
 
 static void init(struct device *dev)
 {
-	printk_debug("MSM800SEV ENTER %s\n", __FUNCTION__);
-	printk_debug("MSM800SEV EXIT %s\n", __FUNCTION__);
+	printk_debug("MSM800SEV ENTER %s\n", __func__);
+	printk_debug("MSM800SEV EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c
index a09e77dd89..b577aae2e3 100644
--- a/src/mainboard/lippert/roadrunner-lx/mainboard.c
+++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c
@@ -42,7 +42,7 @@ static void init(struct device *dev)
 {
 	struct mainboard_lippert_roadrunner_lx_config *mb = dev->chip_info;
 	unsigned int gpio_base, i;
-	printk_debug("LiPPERT RoadRunner-LX ENTER %s\n", __FUNCTION__);
+	printk_debug("LiPPERT RoadRunner-LX ENTER %s\n", __func__);
 
 	/* Init CS5536 GPIOs. */
 	gpio_base = pci_read_config32(dev_find_device(PCI_VENDOR_ID_AMD,
@@ -62,7 +62,7 @@ static void init(struct device *dev)
 	}
 
 	outb(mb->sio_gp1x_config, 0x1220); /* Simple-I/O GP17-10 */
-	printk_debug("LiPPERT RoadRunner-LX EXIT %s\n", __FUNCTION__);
+	printk_debug("LiPPERT RoadRunner-LX EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c
index 8758b9fa68..5ef2ebf3e8 100644
--- a/src/mainboard/lippert/spacerunner-lx/mainboard.c
+++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c
@@ -43,7 +43,7 @@ static void init(struct device *dev)
 {
 	struct mainboard_lippert_spacerunner_lx_config *mb = dev->chip_info;
 	unsigned int gpio_base, i;
-	printk_debug("LiPPERT SpaceRunner-LX ENTER %s\n", __FUNCTION__);
+	printk_debug("LiPPERT SpaceRunner-LX ENTER %s\n", __func__);
 
 	/* Init CS5536 GPIOs */
 	gpio_base = pci_read_config32(dev_find_device(PCI_VENDOR_ID_AMD,
@@ -66,7 +66,7 @@ static void init(struct device *dev)
 	}
 
 	outb(mb->sio_gp1x_config, 0x1220); /* Simple-I/O GP17-10 */
-	printk_debug("LiPPERT SpaceRunner-LX EXIT %s\n", __FUNCTION__);
+	printk_debug("LiPPERT SpaceRunner-LX EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index f99872834a..acedff8d6e 100644
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -104,7 +104,7 @@ static void init(struct device *dev) {
 	unsigned char usbirq = 0xa;
 */
 
-	printk_debug("OLPC BTEST ENTER %s\n", __FUNCTION__);
+	printk_debug("OLPC BTEST ENTER %s\n", __func__);
 
 #if 0
 	/* I can't think of any reason NOT to just set this. If it turns out we want this to be
@@ -112,7 +112,7 @@ static void init(struct device *dev) {
 	  */
 
 	printk_debug("%s (%x,%x)SET USB PCI interrupt line to %d\n", 
-		__FUNCTION__, bus, devfn, usbirq);
+		__func__, bus, devfn, usbirq);
 	usb = dev_find_slot(bus, devfn);
 	if (! usb){
 		printk_err("Could not find USB\n");
@@ -123,7 +123,7 @@ static void init(struct device *dev) {
 
 	init_dcon();
 	init_cafe_irq();
-	printk_debug("OLPC BTEST EXIT %s\n", __FUNCTION__);
+	printk_debug("OLPC BTEST EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c
index e9f5cabf10..a89abb505a 100644
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -76,7 +76,7 @@ static void init(struct device *dev) {
 	unsigned char usbirq = 0xa;
 */
 
-	printk_debug("OLPC REVA ENTER %s\n", __FUNCTION__);
+	printk_debug("OLPC REVA ENTER %s\n", __func__);
 
 #if 0
 	/* I can't think of any reason NOT to just set this. If it turns out we want this to be
@@ -84,7 +84,7 @@ static void init(struct device *dev) {
 	  */
 
 	printk_debug("%s (%x,%x)SET USB PCI interrupt line to %d\n", 
-		__FUNCTION__, bus, devfn, usbirq);
+		__func__, bus, devfn, usbirq);
 	usb = dev_find_slot(bus, devfn);
 	if (! usb){
 		printk_err("Could not find USB\n");
@@ -94,7 +94,7 @@ static void init(struct device *dev) {
 #endif
 
 	init_dcon();
-	printk_debug("OLPC REVA EXIT %s\n", __FUNCTION__);
+	printk_debug("OLPC REVA EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/pcengines/alix1c/mainboard.c b/src/mainboard/pcengines/alix1c/mainboard.c
index 911da6a830..620951a19b 100644
--- a/src/mainboard/pcengines/alix1c/mainboard.c
+++ b/src/mainboard/pcengines/alix1c/mainboard.c
@@ -23,8 +23,8 @@
 
 static void init(struct device *dev)
 {
-	printk_debug("ALIX1.C ENTER %s\n", __FUNCTION__);
-	printk_debug("ALIX1.C EXIT %s\n", __FUNCTION__);
+	printk_debug("ALIX1.C ENTER %s\n", __func__);
+	printk_debug("ALIX1.C EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index d4120c6467..d6d9723b66 100644
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -40,7 +40,7 @@ static void enable_dev(struct device *dev) {
 	volatile struct mmcr *mmcr = MMCRDEFAULT;
 
 	/* currently, nothing in the device to use, so ignore it. */
-	printk_err("Technologic Systems 5300 ENTER %s\n", __FUNCTION__);
+	printk_err("Technologic Systems 5300 ENTER %s\n", __func__);
 
 	/* from fuctory bios */
 	/* NOTE: the following interrupt settings made interrupts work
@@ -144,7 +144,7 @@ static void enable_dev(struct device *dev) {
 	rom_start = 0x09400000 + 0xe0000;
 	rom_end = rom_start + PAYLOAD_SIZE - 1;
 
-	printk_err("TS5300 EXIT %s\n", __FUNCTION__);
+	printk_err("TS5300 EXIT %s\n", __func__);
 	
 }