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

4 files changed, 19 insertions, 19 deletions

diff --git a/src/cpu/amd/model_gx2/cpubug.c b/src/cpu/amd/model_gx2/cpubug.c
index ccc9dbec16..8bbbf7b700 100644
--- a/src/cpu/amd/model_gx2/cpubug.c
+++ b/src/cpu/amd/model_gx2/cpubug.c
@@ -169,7 +169,7 @@ eng2900(void)
 {
 	msr_t msr;
 
-	printk_debug("CPU_BUG:%s\n", __FUNCTION__);
+	printk_debug("CPU_BUG:%s\n", __func__);
 	/* Clear bit 43, disables the sysenter/sysexit in CPUID3 */
 	msr = rdmsr(0x3003);
 	msr.hi &= 0xFFFFF7FF;
diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c
index fef3c7f0ab..90f1e0b049 100644
--- a/src/cpu/amd/sc520/sc520.c
+++ b/src/cpu/amd/sc520/sc520.c
@@ -49,14 +49,14 @@ static void cpu_init(device_t dev)
 void sc520_enable_resources(struct device *dev) {
 	unsigned char command;
 
-	printk_spew("%s\n", __FUNCTION__);
+	printk_spew("%s\n", __func__);
         command = pci_read_config8(dev, PCI_COMMAND);
-        printk_spew("========>%s, command 0x%x\n", __FUNCTION__, command);
+        printk_spew("========>%s, command 0x%x\n", __func__, command);
         command |= PCI_COMMAND_MEMORY | PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
-        printk_spew("========>%s, command 0x%x\n", __FUNCTION__, command);
+        printk_spew("========>%s, command 0x%x\n", __func__, command);
         pci_write_config8(dev, PCI_COMMAND, command);
         command = pci_read_config8(dev, PCI_COMMAND);
-        printk_spew("========>%s, command 0x%x\n", __FUNCTION__, command);
+        printk_spew("========>%s, command 0x%x\n", __func__, command);
 /*
  */
 
@@ -85,7 +85,7 @@ static const struct pci_driver cpu_driver __pci_driver = {
 static void pci_domain_read_resources(device_t dev)
 {
         struct resource *resource;
-  printk_spew("%s\n", __FUNCTION__);
+  printk_spew("%s\n", __func__);
         /* Initialize the system wide io space constraints */
         resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0,0));
         resource->limit = 0xffffUL;
@@ -101,7 +101,7 @@ static void ram_resource(device_t dev, unsigned long index,
         unsigned long basek, unsigned long sizek)
 {
         struct resource *resource;
-  printk_spew("%s sizek 0x%x\n", __FUNCTION__, sizek);
+  printk_spew("%s sizek 0x%x\n", __func__, sizek);
         if (!sizek) {
                 return;
         }
@@ -127,14 +127,14 @@ static uint32_t find_pci_tolm(struct bus *bus)
 {
 	struct resource *min;
 	uint32_t tolm;
-  printk_spew("%s\n", __FUNCTION__);
+  printk_spew("%s\n", __func__);
 	min = 0;
 	search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test, &min);
 	tolm = 0xffffffffUL;
 	if (min && tolm > min->base) {
 		tolm = min->base;
 	}
-  printk_spew("%s returns 0x%x\n", __FUNCTION__, tolm);
+  printk_spew("%s returns 0x%x\n", __func__, tolm);
 	return tolm;
 }
 
@@ -142,7 +142,7 @@ static void pci_domain_set_resources(device_t dev)
 {
 	device_t mc_dev;
         uint32_t pci_tolm;
-  printk_spew("%s\n", __FUNCTION__);
+  printk_spew("%s\n", __func__);
         pci_tolm = find_pci_tolm(&dev->link[0]);
 	mc_dev = dev->link[0].children;
 	if (mc_dev) {
@@ -186,7 +186,7 @@ static void pci_domain_set_resources(device_t dev)
 
 static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
 {
-  printk_spew("%s\n", __FUNCTION__);
+  printk_spew("%s\n", __func__);
         max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
         return max;
 }
@@ -195,20 +195,20 @@ static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
 #if 0
 void sc520_enable_resources(device_t dev) {
 
-	printk_spew("%s\n", __FUNCTION__);
+	printk_spew("%s\n", __func__);
 	printk_spew("THIS IS FOR THE SC520 =============================\n");
 
 /*
 	command = pci_read_config8(dev, PCI_COMMAND);
-	printk_spew("%s, command 0x%x\n", __FUNCTION__, command);
+	printk_spew("%s, command 0x%x\n", __func__, command);
 	command |= PCI_COMMAND_MEMORY;
-	printk_spew("%s, command 0x%x\n", __FUNCTION__, command);
+	printk_spew("%s, command 0x%x\n", __func__, command);
 	pci_write_config8(dev, PCI_COMMAND, command);
 	command = pci_read_config8(dev, PCI_COMMAND);
-	printk_spew("%s, command 0x%x\n", __FUNCTION__, command);
+	printk_spew("%s, command 0x%x\n", __func__, command);
  */
 	enable_childrens_resources(dev);
-	printk_spew("%s\n", __FUNCTION__);
+	printk_spew("%s\n", __func__);
 }
 #endif
 
@@ -247,7 +247,7 @@ static struct device_operations cpu_bus_ops = {
 
 static void enable_dev(struct device *dev)
 {
-  printk_spew("%s\n", __FUNCTION__);
+  printk_spew("%s\n", __func__);
         /* Set the operations if it is a special bus type */
         if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
                 dev->ops = &pci_domain_ops;
diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index 72373751eb..aa65286650 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -445,7 +445,7 @@ void x86_setup_var_mtrrs(unsigned address_bits)
 	}
 	printk_spew("call enable_var_mtrr()\n");
 	enable_var_mtrr();
-	printk_spew("Leave %s\n", __FUNCTION__);
+	printk_spew("Leave %s\n", __func__);
 	post_code(0x6A);
 }
 
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index a791f7930e..92de0288a7 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -131,7 +131,7 @@ static unsigned long long calibrate_tsc(void)
 	printk_spew("32-bit delta %d\n", (unsigned long) delta);
 	
 	printk_spew("%s 32-bit result is %d\n",
-			__FUNCTION__,
+			__func__,
 			result);
 	return delta;
 }