diff options
37 files changed, 122 insertions, 122 deletions
diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c index 7f9d0924a1..598cc3ca8d 100644 --- a/src/arch/i386/boot/pirq_routing.c +++ b/src/arch/i386/boot/pirq_routing.c @@ -26,7 +26,7 @@ static void check_pirq_routing_table(struct irq_routing_table *rt) sum += addr[i]; printk_debug("%s(): Interrupt Routing Table located at %p.\n", - __FUNCTION__, addr); + __func__, addr); sum = rt->checksum - sum; diff --git a/src/arch/i386/smp/mpspec.c b/src/arch/i386/smp/mpspec.c index ce76fb8197..c8d966f7fd 100644 --- a/src/arch/i386/smp/mpspec.c +++ b/src/arch/i386/smp/mpspec.c @@ -200,7 +200,7 @@ void smp_write_intsrc(struct mp_config_table *mc, #if CONFIG_DEBUG_MPTABLE == 1 printk_info("add intsrc srcbus 0x%x srcbusirq 0x%x, dstapic 0x%x, dstirq 0x%x\n", srcbus, srcbusirq, dstapic, dstirq); - hexdump(__FUNCTION__, mpc, sizeof(*mpc)); + hexdump(__func__, mpc, sizeof(*mpc)); #endif } 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; } diff --git a/src/lib/malloc.c b/src/lib/malloc.c index c853452284..93d5622b74 100644 --- a/src/lib/malloc.c +++ b/src/lib/malloc.c @@ -27,7 +27,7 @@ void *malloc(size_t size) { void *p; - MALLOCDBG(("%s Enter, size %d, free_mem_ptr %p\n", __FUNCTION__, size, free_mem_ptr)); + MALLOCDBG(("%s Enter, size %d, free_mem_ptr %p\n", __func__, size, free_mem_ptr)); if (size < 0) die("Error! malloc: Size < 0"); if (free_mem_ptr <= 0) 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__); } diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c index 5a01979c0a..247c24304e 100644 --- a/src/northbridge/amd/gx1/northbridge.c +++ b/src/northbridge/amd/gx1/northbridge.c @@ -42,7 +42,7 @@ static void enable_shadow(device_t dev) static void northbridge_init(device_t dev) { - printk_debug("northbridge: %s()\n", __FUNCTION__); + printk_debug("northbridge: %s()\n", __func__); optimize_xbus(dev); enable_shadow(dev); @@ -74,7 +74,7 @@ static void pci_domain_read_resources(device_t dev) { struct resource *resource; - printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __FUNCTION__); + printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __func__); /* Initialize the system wide io space constraints */ resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0,0)); @@ -191,7 +191,7 @@ static struct device_operations pci_domain_ops = { static void cpu_bus_init(device_t dev) { - printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __FUNCTION__); + printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __func__); initialize_cpus(&dev->link[0]); } @@ -209,7 +209,7 @@ static struct device_operations cpu_bus_ops = { static void enable_dev(struct device *dev) { - printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __FUNCTION__); + printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __func__); /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { printk_spew("DEVICE_PATH_PCI_DOMAIN\n"); diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c index 7702d3b5a7..e285e52cb6 100644 --- a/src/northbridge/amd/gx2/northbridge.c +++ b/src/northbridge/amd/gx2/northbridge.c @@ -127,7 +127,7 @@ static void irq_init_steering(struct device *dev, uint16_t irq_map) { /* Set up IRQ steering */ uint32_t pciAddr = 0x80000000 | (CHIPSET_DEV_NUM << 11) | 0x5C; - printk_debug("%s(%08X [%08X], %04X)\n", __FUNCTION__, dev, pciAddr, irq_map); + printk_debug("%s(%08X [%08X], %04X)\n", __func__, dev, pciAddr, irq_map); /* The IRQ steering values (in hex) are effectively dcba, where: * <a> represents the IRQ for INTA, @@ -281,7 +281,7 @@ static void northbridge_init(device_t dev) unsigned long m; struct northbridge_amd_gx2_config *nb = (struct northbridge_amd_gx2_config *)dev->chip_info; - printk_debug("northbridge: %s()\n", __FUNCTION__); + printk_debug("northbridge: %s()\n", __func__); enable_shadow(dev); irq_init_steering(dev, nb->irqmap); @@ -362,7 +362,7 @@ static void pci_domain_read_resources(device_t dev) { struct resource *resource; - printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __FUNCTION__); + printk_spew("%s:%s()\n", NORTHBRIDGE_FILE, __func__); /* Initialize the system wide io space constraints */ resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0,0)); diff --git a/src/northbridge/amd/gx2/northbridgeinit.c b/src/northbridge/amd/gx2/northbridgeinit.c index eb43c6861f..995c1f3212 100644 --- a/src/northbridge/amd/gx2/northbridgeinit.c +++ b/src/northbridge/amd/gx2/northbridgeinit.c @@ -112,10 +112,10 @@ writeglmsr(struct gliutable *gl){ msr.lo = gl->lo; msr.hi = gl->hi; wrmsr(gl->desc_name, msr); // MSR - see table above - printk_debug("%s: write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); + printk_debug("%s: write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); /* they do this, so we do this */ msr = rdmsr(gl->desc_name); - printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); + printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void @@ -147,7 +147,7 @@ SysmemInit(struct gliutable *gl) * system. We will adjust for SMM and DMM now and Frame Buffer later. */ sizembytes = sizeram(); - printk_debug("%s: enable for %dm bytes\n", __FUNCTION__, sizembytes); + printk_debug("%s: enable for %dm bytes\n", __func__, sizembytes); sizebytes = sizembytes << 20; sizebytes -= SMM_SIZE*1024 +1; @@ -164,7 +164,7 @@ SysmemInit(struct gliutable *gl) msr.lo = sizebytes; wrmsr(gl->desc_name, msr); // MSR - see table above msr = rdmsr(gl->desc_name); - printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, + printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } @@ -177,11 +177,11 @@ DMMGL0Init(struct gliutable *gl) { if (! havedmi) return; - printk_debug("%s: %d bytes\n", __FUNCTION__, sizebytes); + printk_debug("%s: %d bytes\n", __func__, sizebytes); sizebytes -= DMM_SIZE*1024; offset = sizebytes - DMM_OFFSET; - printk_debug("%s: offset is 0x%08x\n", __FUNCTION__, offset); + printk_debug("%s: offset is 0x%08x\n", __func__, offset); offset >>= 12; msr.hi = (gl->hi) | (offset << 8); /* I don't think this is needed */ @@ -192,7 +192,7 @@ DMMGL0Init(struct gliutable *gl) { wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); + printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void @@ -202,7 +202,7 @@ DMMGL1Init(struct gliutable *gl) { if (! havedmi) return; - printk_debug("%s:\n", __FUNCTION__ ); + printk_debug("%s:\n", __func__ ); msr.hi = gl->hi; /* I don't think this is needed */ @@ -210,12 +210,12 @@ DMMGL1Init(struct gliutable *gl) { msr.hi |= (DMM_OFFSET >> 24); msr.lo = DMM_OFFSET << 8; /* hmm. AMD source has SMM here ... SMM, not DMM? We think DMM */ - printk_err("%s: warning, using DMM_SIZE even though AMD used SMM_SIZE\n", __FUNCTION__); + printk_err("%s: warning, using DMM_SIZE even though AMD used SMM_SIZE\n", __func__); msr.lo |= ((~(DMM_SIZE*1024)+1)>>12)&0xfffff; wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); + printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void SMMGL0Init(struct gliutable *gl) { @@ -228,10 +228,10 @@ SMMGL0Init(struct gliutable *gl) { if (havedmi) sizebytes -= DMM_SIZE * 1024; - printk_debug("%s: %d bytes\n", __FUNCTION__, sizebytes); + printk_debug("%s: %d bytes\n", __func__, sizebytes); offset = sizebytes - SMM_OFFSET; - printk_debug("%s: offset is 0x%08x\n", __FUNCTION__, offset); + printk_debug("%s: offset is 0x%08x\n", __func__, offset); offset >>= 12; msr.hi = offset << 8; @@ -242,12 +242,12 @@ SMMGL0Init(struct gliutable *gl) { wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); + printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void SMMGL1Init(struct gliutable *gl) { msr_t msr; - printk_debug("%s:\n", __FUNCTION__ ); + printk_debug("%s:\n", __func__ ); msr.hi = gl->hi; /* I don't think this is needed */ @@ -258,7 +258,7 @@ SMMGL1Init(struct gliutable *gl) { wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); + printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void @@ -507,10 +507,10 @@ performance: for(i = 0; gating->msrnum != 0xffffffff; i++) { msr = rdmsr(gating->msrnum); - printk_debug("%s: MSR 0x%08x is 0x%08x:0x%08x\n", __FUNCTION__, gating->msrnum, msr.hi, msr.lo); + printk_debug("%s: MSR 0x%08x is 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo); msr.hi |= gating->msr.hi; msr.lo |= gating->msr.lo; - printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __FUNCTION__, + printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo); wrmsr(gating->msrnum, msr); // MSR - See the table above gating +=1; @@ -526,11 +526,11 @@ GeodeLinkPriority(void){ for(i = 0; prio->msrnum != 0xffffffff; i++) { msr = rdmsr(prio->msrnum); - printk_debug("%s: MSR 0x%08x is 0x%08x:0x%08x\n", __FUNCTION__, prio->msrnum, msr.hi, msr.lo); + printk_debug("%s: MSR 0x%08x is 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo); msr.hi |= prio->msr.hi; msr.lo &= ~0xfff; msr.lo |= prio->msr.lo; - printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __FUNCTION__, + printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo); wrmsr(prio->msrnum, msr); // MSR - See the table above prio +=1; @@ -772,7 +772,7 @@ northbridgeinit(void) { msr_t msr; int i; - printk_debug("Enter %s\n", __FUNCTION__); + printk_debug("Enter %s\n", __func__); for(i = 0; gliutables[i]; i++) GLIUInit(gliutables[i]); @@ -803,6 +803,6 @@ northbridgeinit(void) ClockGatingInit(); __asm__("FINIT\n"); /* CPUBugsFix -- called elsewhere */ - printk_debug("Exit %s\n", __FUNCTION__); + printk_debug("Exit %s\n", __func__); } diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c index 588023cbbc..9762510cf4 100644 --- a/src/northbridge/amd/lx/northbridge.c +++ b/src/northbridge/amd/lx/northbridge.c @@ -308,7 +308,7 @@ static void northbridge_init(device_t dev) { //msr_t msr; - printk_spew(">> Entering northbridge.c: %s\n", __FUNCTION__); + printk_spew(">> Entering northbridge.c: %s\n", __func__); enable_shadow(dev); /* @@ -385,7 +385,7 @@ static const struct pci_driver northbridge_driver __pci_driver = { static void pci_domain_read_resources(device_t dev) { struct resource *resource; - printk_spew(">> Entering northbridge.c: %s\n", __FUNCTION__); + printk_spew(">> Entering northbridge.c: %s\n", __func__); /* Initialize the system wide io space constraints */ resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0)); @@ -420,7 +420,7 @@ static void pci_domain_set_resources(device_t dev) int idx; device_t mc_dev; - printk_spew(">> Entering northbridge.c: %s\n", __FUNCTION__); + printk_spew(">> Entering northbridge.c: %s\n", __func__); mc_dev = dev->link[0].children; if (mc_dev) { @@ -436,7 +436,7 @@ static void pci_domain_set_resources(device_t dev) static void pci_domain_enable(device_t dev) { - printk_spew(">> Entering northbridge.c: %s\n", __FUNCTION__); + printk_spew(">> Entering northbridge.c: %s\n", __func__); // do this here for now -- this chip really breaks our device model northbridge_init_early(); @@ -459,7 +459,7 @@ static void pci_domain_enable(device_t dev) static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max) { - printk_spew(">> Entering northbridge.c: %s\n", __FUNCTION__); + printk_spew(">> Entering northbridge.c: %s\n", __func__); max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max); return max; @@ -475,7 +475,7 @@ static struct device_operations pci_domain_ops = { static void cpu_bus_init(device_t dev) { - printk_spew(">> Entering northbridge.c: %s\n", __FUNCTION__); + printk_spew(">> Entering northbridge.c: %s\n", __func__); initialize_cpus(&dev->link[0]); } @@ -495,7 +495,7 @@ static struct device_operations cpu_bus_ops = { static void enable_dev(struct device *dev) { printk_spew(">> Entering northbridge.c: %s with path %d\n", - __FUNCTION__, dev->path.type); + __func__, dev->path.type); /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) diff --git a/src/northbridge/amd/lx/northbridgeinit.c b/src/northbridge/amd/lx/northbridgeinit.c index 057076380b..4f00a80891 100644 --- a/src/northbridge/amd/lx/northbridgeinit.c +++ b/src/northbridge/amd/lx/northbridgeinit.c @@ -108,7 +108,7 @@ static void writeglmsr(struct gliutable *gl) msr.lo = gl->lo; msr.hi = gl->hi; wrmsr(gl->desc_name, msr); // MSR - see table above - printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, gl->desc_name, msr.hi, msr.lo); // GX3 + printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); // GX3 } static void ShadowInit(struct gliutable *gl) @@ -133,7 +133,7 @@ static void SysmemInit(struct gliutable *gl) * system. We will adjust for SMM now and Frame Buffer later. */ sizembytes = sizeram(); - printk_debug("%s: enable for %dMBytes\n", __FUNCTION__, sizembytes); + printk_debug("%s: enable for %dMBytes\n", __func__, sizembytes); sizebytes = sizembytes << 20; sizebytes -= ((SMM_SIZE * 1024) + 1); @@ -149,7 +149,7 @@ static void SysmemInit(struct gliutable *gl) msr.lo = sizebytes; wrmsr(gl->desc_name, msr); // MSR - see table above - printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, + printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } @@ -161,12 +161,12 @@ static void SMMGL0Init(struct gliutable *gl) sizebytes -= (SMM_SIZE * 1024); - printk_debug("%s: %d bytes\n", __FUNCTION__, sizebytes); + printk_debug("%s: %d bytes\n", __func__, sizebytes); /* calculate the Two's complement offset */ offset = sizebytes - SMM_OFFSET; offset = (offset >> 12) & 0x000fffff; - printk_debug("%s: offset is 0x%08x\n", __FUNCTION__, SMM_OFFSET); + printk_debug("%s: offset is 0x%08x\n", __func__, SMM_OFFSET); msr.hi = offset << 8 | gl->hi; msr.hi |= SMM_OFFSET >> 24; @@ -175,14 +175,14 @@ static void SMMGL0Init(struct gliutable *gl) msr.lo |= ((~(SMM_SIZE * 1024) + 1) >> 12) & 0xfffff; wrmsr(gl->desc_name, msr); // MSR - See table above - printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, + printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void SMMGL1Init(struct gliutable *gl) { msr_t msr; - printk_debug("%s:\n", __FUNCTION__); + printk_debug("%s:\n", __func__); msr.hi = gl->hi; /* I don't think this is needed */ @@ -192,7 +192,7 @@ static void SMMGL1Init(struct gliutable *gl) msr.lo |= ((~(SMM_SIZE * 1024) + 1) >> 12) & 0xfffff; wrmsr(gl->desc_name, msr); // MSR - See table above - printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __FUNCTION__, + printk_debug("%s: MSR 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } @@ -437,7 +437,7 @@ static void ClockGatingInit(void) msr = rdmsr(gating->msrnum); msr.hi |= gating->msr.hi; msr.lo |= gating->msr.lo; - /* printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __FUNCTION__, + /* printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo); */// GX3 wrmsr(gating->msrnum, msr); // MSR - See the table above gating += 1; @@ -456,7 +456,7 @@ static void GeodeLinkPriority(void) msr.hi |= prio->msr.hi; msr.lo &= ~0xfff; msr.lo |= prio->msr.lo; - /* printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __FUNCTION__, + /* printk_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo); */// GX3 wrmsr(prio->msrnum, msr); // MSR - See the table above prio += 1; @@ -751,7 +751,7 @@ void northbridge_init_early(void) { msr_t msr; int i; - printk_debug("Enter %s\n", __FUNCTION__); + printk_debug("Enter %s\n", __func__); for (i = 0; gliutables[i]; i++) GLIUInit(gliutables[i]); @@ -771,5 +771,5 @@ void northbridge_init_early(void) ClockGatingInit(); __asm__ __volatile__("FINIT\n"); - printk_debug("Exit %s\n", __FUNCTION__); + printk_debug("Exit %s\n", __func__); } diff --git a/src/pc80/ide/ide.c b/src/pc80/ide/ide.c index a164e9e762..3ca60ad09d 100644 --- a/src/pc80/ide/ide.c +++ b/src/pc80/ide/ide.c @@ -343,7 +343,7 @@ static inline int ide_read_sector_lba( info->slave | IDE_DH_LBA; cmd.command = IDE_CMD_READ_SECTORS; - //printk_debug("%s: sector= %ld, device command= 0x%x.\n",__FUNCTION__,(unsigned long) sector, cmd.device); + //printk_debug("%s: sector= %ld, device command= 0x%x.\n",__func__,(unsigned long) sector, cmd.device); #ifdef __BIG_ENDIAN return pio_data_in_sw(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE); #else /* __BIG_ENDIAN */ diff --git a/src/southbridge/amd/cs5535/cs5535.c b/src/southbridge/amd/cs5535/cs5535.c index e56e199c41..d1ec056a89 100644 --- a/src/southbridge/amd/cs5535/cs5535.c +++ b/src/southbridge/amd/cs5535/cs5535.c @@ -46,7 +46,7 @@ static void nvram_on(struct device *dev) static void southbridge_init(struct device *dev) { - printk_spew("cs5535: %s\n", __FUNCTION__); + printk_spew("cs5535: %s\n", __func__); nvram_on(dev); } @@ -66,12 +66,12 @@ static void dump_south(struct device *dev) static void southbridge_enable(struct device *dev) { - printk_spew("%s: dev is %p\n", __FUNCTION__, dev); + printk_spew("%s: dev is %p\n", __func__, dev); } static void cs5535_pci_dev_enable_resources(device_t dev) { - printk_spew("cs5535.c: %s()\n", __FUNCTION__); + printk_spew("cs5535.c: %s()\n", __func__); pci_dev_enable_resources(dev); enable_childrens_resources(dev); } diff --git a/src/southbridge/amd/cs5535/cs5535_ide.c b/src/southbridge/amd/cs5535/cs5535_ide.c index b6397268be..30901672b7 100644 --- a/src/southbridge/amd/cs5535/cs5535_ide.c +++ b/src/southbridge/amd/cs5535/cs5535_ide.c @@ -7,12 +7,12 @@ static void ide_init(struct device *dev) { - printk_spew("cs5535_ide: %s\n", __FUNCTION__); + printk_spew("cs5535_ide: %s\n", __func__); } static void ide_enable(struct device *dev) { - printk_spew("cs5535_ide: %s\n", __FUNCTION__); + printk_spew("cs5535_ide: %s\n", __func__); } static struct device_operations ide_ops = { diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c index 0acc5ca5c2..e9dc868df1 100644 --- a/src/southbridge/amd/cs5536/cs5536.c +++ b/src/southbridge/amd/cs5536/cs5536.c @@ -579,7 +579,7 @@ static void southbridge_init(struct device *dev) * unsigned short gpiobase = MDD_GPIO; */ - printk_err("cs5536: %s\n", __FUNCTION__); + printk_err("cs5536: %s\n", __func__); setup_i8259(); lpc_init(sb); uarts_init(sb); @@ -591,7 +591,7 @@ static void southbridge_init(struct device *dev) (sb->enable_gpio_int_route >> 16)); } - printk_err("cs5536: %s: enable_ide_nand_flash is %d\n", __FUNCTION__, + printk_err("cs5536: %s: enable_ide_nand_flash is %d\n", __func__, sb->enable_ide_nand_flash); if (sb->enable_ide_nand_flash == 1) { enable_ide_nand_flash_header(); @@ -610,13 +610,13 @@ static void southbridge_init(struct device *dev) static void southbridge_enable(struct device *dev) { - printk_err("cs5536: %s: dev is %p\n", __FUNCTION__, dev); + printk_err("cs5536: %s: dev is %p\n", __func__, dev); } static void cs5536_pci_dev_enable_resources(device_t dev) { - printk_err("cs5536: %s()\n", __FUNCTION__); + printk_err("cs5536: %s()\n", __func__); pci_dev_enable_resources(dev); enable_childrens_resources(dev); } diff --git a/src/southbridge/amd/cs5536/cs5536_ide.c b/src/southbridge/amd/cs5536/cs5536_ide.c index b0d711c948..bbb6bb5bcd 100644 --- a/src/southbridge/amd/cs5536/cs5536_ide.c +++ b/src/southbridge/amd/cs5536/cs5536_ide.c @@ -36,7 +36,7 @@ static void ide_init(struct device *dev) { uint32_t ide_cfg; - printk_spew("cs5536_ide: %s\n", __FUNCTION__); + printk_spew("cs5536_ide: %s\n", __func__); /* GPIO and IRQ setup are handled in the main chipset code. */ // Enable the channel and Post Write Buffer @@ -49,7 +49,7 @@ static void ide_init(struct device *dev) static void ide_enable(struct device *dev) { - printk_spew("cs5536_ide: %s\n", __FUNCTION__); + printk_spew("cs5536_ide: %s\n", __func__); } diff --git a/src/southbridge/via/vt8231/vt8231_ide.c b/src/southbridge/via/vt8231/vt8231_ide.c index dfb8c9920e..3cfa01ea45 100644 --- a/src/southbridge/via/vt8231/vt8231_ide.c +++ b/src/southbridge/via/vt8231/vt8231_ide.c @@ -20,7 +20,7 @@ static void ide_init(struct device *dev) */ /* - printk_info("%s: enabling compatibility IDE addresses\n", __FUNCTION__); + printk_info("%s: enabling compatibility IDE addresses\n", __func__); enables = pci_read_config8(dev, 0x42); printk_debug("enables in reg 0x42 0x%x\n", enables); enables &= ~0xc0; // compatability mode diff --git a/src/southbridge/via/vt8231/vt8231_lpc.c b/src/southbridge/via/vt8231/vt8231_lpc.c index 54eef96973..4b906359b0 100644 --- a/src/southbridge/via/vt8231/vt8231_lpc.c +++ b/src/southbridge/via/vt8231/vt8231_lpc.c @@ -24,7 +24,7 @@ static const unsigned char slotIrqs[4] = { 5, 10, 12, 11 }; static void pci_routing_fixup(struct device *dev) { - printk_info("%s: dev is %p\n", __FUNCTION__, dev); + printk_info("%s: dev is %p\n", __func__, dev); if (dev) { /* initialize PCI interupts - these assignments depend on the PCB routing of PINTA-D @@ -50,7 +50,7 @@ static void pci_routing_fixup(struct device *dev) // PCI slot printk_info("setting pci slot\n"); pci_assign_irqs(0, 0x14, slotIrqs); - printk_info("%s: DONE\n", __FUNCTION__); + printk_info("%s: DONE\n", __func__); } static void vt8231_init(struct device *dev) diff --git a/src/southbridge/via/vt8235/vt8235_ide.c b/src/southbridge/via/vt8235/vt8235_ide.c index 5f7a85fd07..47d1b05a1e 100644 --- a/src/southbridge/via/vt8235/vt8235_ide.c +++ b/src/southbridge/via/vt8235/vt8235_ide.c @@ -20,7 +20,7 @@ static void ide_init(struct device *dev) * reason. */ printk_info("%s: enabling compatibility IDE addresses\n", - __FUNCTION__); + __func__); enables = pci_read_config8(dev, 0x42); printk_debug("enables in reg 0x42 0x%x\n", enables); enables &= ~0xc0; // compatability mode diff --git a/src/southbridge/via/vt8235/vt8235_lpc.c b/src/southbridge/via/vt8235/vt8235_lpc.c index 9c18891b10..521271d1a8 100644 --- a/src/southbridge/via/vt8235/vt8235_lpc.c +++ b/src/southbridge/via/vt8235/vt8235_lpc.c @@ -57,7 +57,7 @@ static unsigned char *pin_to_irq(const unsigned char *pin) static void pci_routing_fixup(struct device *dev) { - printk_info("%s: dev is %p\n", __FUNCTION__, dev); + printk_info("%s: dev is %p\n", __func__, dev); /* set up PCI IRQ routing */ pci_write_config8(dev, 0x55, pciIrqs[0] << 4); @@ -97,7 +97,7 @@ static void pci_routing_fixup(struct device *dev) printk_info("setting riser slot\n"); pci_assign_irqs(0, 0x13, pin_to_irq(riserPins)); - printk_spew("%s: DONE\n", __FUNCTION__); + printk_spew("%s: DONE\n", __func__); } /* diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c index 9357cf7e08..3c3614c608 100644 --- a/src/stream/rom_stream.c +++ b/src/stream/rom_stream.c @@ -124,7 +124,7 @@ byte_offset_t stream_skip(byte_offset_t count) bytes = count; if ((rom + bytes - 1) > rom_end) { printk_warning("%6d:%s() - overflowed source buffer\n", - __LINE__, __FUNCTION__); + __LINE__, __func__); bytes = 0; if (rom <= rom_end) { bytes = (rom_end - rom) + 1; diff --git a/src/stream/serial_stream.c b/src/stream/serial_stream.c index 5be6624ac4..9fb53cf2af 100644 --- a/src/stream/serial_stream.c +++ b/src/stream/serial_stream.c @@ -73,7 +73,7 @@ byte_offset_t stream_skip(byte_offset_t count) { if ((stream_start + count) > stream_end) { printk_warning("%6d:%s() - overflowed source buffer\n", - __LINE__, __FUNCTION__); + __LINE__, __func__); count = 0; if (stream_start <= stream_end) { count = (stream_end - stream_start) + 1; |