tree: Use __func__ instead of hard-coded names
Change-Id: I87e383ce2f28340dbc3c843dbf2ed0e47c00a723
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72382
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
diff --git a/src/lib/gcov-glue.c b/src/lib/gcov-glue.c
index 6bdb870..d8ebe70 100644
--- a/src/lib/gcov-glue.c
+++ b/src/lib/gcov-glue.c
@@ -29,8 +29,7 @@
static FILE *fopen(const char *path, const char *mode)
{
#if CONFIG(DEBUG_COVERAGE)
- printk(BIOS_DEBUG, "fopen %s with mode %s\n",
- path, mode);
+ printk(BIOS_DEBUG, "%s %s with mode %s\n", __func__, path, mode);
#endif
if (!current_file) {
current_file = cbmem_add(CBMEM_ID_COVERAGE, 32*1024);
@@ -62,7 +61,7 @@
static int fclose(FILE *stream)
{
#if CONFIG(DEBUG_COVERAGE)
- printk(BIOS_DEBUG, "fclose %s\n", stream->filename);
+ printk(BIOS_DEBUG, "%s %s\n", __func__, stream->filename);
#endif
return 0;
}
@@ -73,8 +72,8 @@
* to a freshly opened file. */
gcc_assert(offset == 0 && whence == SEEK_SET);
#if CONFIG(DEBUG_COVERAGE)
- printk(BIOS_DEBUG, "fseek %s offset=%ld whence=%d\n",
- stream->filename, offset, whence);
+ printk(BIOS_DEBUG, "%s %s offset=%ld whence=%d\n",
+ __func__, stream->filename, offset, whence);
#endif
return 0;
}
@@ -84,7 +83,7 @@
/* ftell should currently not be called */
BUG();
#if CONFIG(DEBUG_COVERAGE)
- printk(BIOS_DEBUG, "ftell %s\n", stream->filename);
+ printk(BIOS_DEBUG, "%s %s\n", __func__, stream->filename);
#endif
return 0;
}
@@ -92,8 +91,8 @@
static size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
{
#if CONFIG(DEBUG_COVERAGE)
- printk(BIOS_DEBUG, "fread: ptr=%p size=%zd nmemb=%zd FILE*=%p\n",
- ptr, size, nmemb, stream);
+ printk(BIOS_DEBUG, "%s: ptr=%p size=%zd nmemb=%zd FILE*=%p\n",
+ __func__, ptr, size, nmemb, stream);
#endif
return 0;
}
@@ -101,8 +100,8 @@
static size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream)
{
#if CONFIG(DEBUG_COVERAGE)
- printk(BIOS_DEBUG, "fwrite: %zd * %zd bytes to file %s\n",
- nmemb, size, stream->filename);
+ printk(BIOS_DEBUG, "%s: %zd * %zd bytes to file %s\n",
+ __func__, nmemb, size, stream->filename);
#endif
// TODO check if file is last opened file and fail otherwise.
diff --git a/src/lib/malloc.c b/src/lib/malloc.c
index 2c73219..052a53e 100644
--- a/src/lib/malloc.c
+++ b/src/lib/malloc.c
@@ -38,16 +38,16 @@
free_last_alloc_ptr = p;
if (free_mem_ptr >= free_mem_end_ptr) {
- printk(BIOS_ERR, "memalign(boundary=%zu, size=%zu): failed: ",
- boundary, size);
+ printk(BIOS_ERR, "%s(boundary=%zu, size=%zu): failed: ",
+ __func__, boundary, size);
printk(BIOS_ERR, "Tried to round up free_mem_ptr %p to %p\n",
p, free_mem_ptr);
printk(BIOS_ERR, "but free_mem_end_ptr is %p\n",
free_mem_end_ptr);
- die("Error! memalign: Out of memory (free_mem_ptr >= free_mem_end_ptr)");
+ die("Error! %s: Out of memory (free_mem_ptr >= free_mem_end_ptr)", __func__);
}
- MALLOCDBG("memalign %p\n", p);
+ MALLOCDBG("%s %p\n", __func__, p);
return p;
}
diff --git a/src/mainboard/google/auron/ec.c b/src/mainboard/google/auron/ec.c
index a3ee95b..2334cb61 100644
--- a/src/mainboard/google/auron/ec.c
+++ b/src/mainboard/google/auron/ec.c
@@ -16,7 +16,7 @@
int s3_wakeup = acpi_is_wakeup_s3();
- printk(BIOS_DEBUG, "mainboard_ec_init\n");
+ printk(BIOS_DEBUG, "%s\n", __func__);
post_code(0xf0);
google_chromeec_events_init(&info, s3_wakeup);
diff --git a/src/mainboard/google/cyan/ec.c b/src/mainboard/google/cyan/ec.c
index 41ef91e..e34ea7f 100644
--- a/src/mainboard/google/cyan/ec.c
+++ b/src/mainboard/google/cyan/ec.c
@@ -14,7 +14,7 @@
.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
};
- printk(BIOS_DEBUG, "mainboard_ec_init\n");
+ printk(BIOS_DEBUG, "%s\n", __func__);
post_code(0xf0);
google_chromeec_events_init(&info, acpi_is_wakeup_s3());
diff --git a/src/mainboard/google/link/ec.c b/src/mainboard/google/link/ec.c
index 6f87f1d..2c2ed74 100644
--- a/src/mainboard/google/link/ec.c
+++ b/src/mainboard/google/link/ec.c
@@ -14,7 +14,7 @@
.s5_wake_events = LINK_EC_S5_WAKE_EVENTS,
};
- printk(BIOS_DEBUG, "link_ec_init\n");
+ printk(BIOS_DEBUG, "%s\n", __func__);
post_code(0xf0);
google_chromeec_events_init(&info, acpi_is_wakeup_s3());
diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c
index 9148780..5a4863d 100644
--- a/src/mainboard/google/peach_pit/romstage.c
+++ b/src/mainboard/google/peach_pit/romstage.c
@@ -173,13 +173,13 @@
}
if (rdev_readat(boot_dev, data, 0, amt) < amt) {
- printk(BIOS_SPEW, "simple_spi_test fails\n");
+ printk(BIOS_SPEW, "%s fails\n", __func__);
return;
}
for (i = 0; i < amt; i += 4){
if (rdev_readat(boot_dev, &in, i, 4) < 4) {
- printk(BIOS_SPEW, "simple_spi_test fails at %d\n", i);
+ printk(BIOS_SPEW, "%s fails at %d\n", __func__, i);
return;
}
if (data[i/4] != in){
@@ -188,7 +188,7 @@
i, &data[i/4], (unsigned long)data[i/4], (unsigned long)in);
/* reread it to see which is wrong. */
if (rdev_readat(boot_dev, &in, i, 4) < 4) {
- printk(BIOS_SPEW, "simple_spi_test fails at %d\n", i);
+ printk(BIOS_SPEW, "%s fails at %d\n", __func__, i);
return;
}
printk(BIOS_SPEW, "RTRY at %d(%p):\nRAM %08lx\nSPI %08lx\n",
diff --git a/src/mainboard/google/rambi/ec.c b/src/mainboard/google/rambi/ec.c
index 7588eff..f8b86ee 100644
--- a/src/mainboard/google/rambi/ec.c
+++ b/src/mainboard/google/rambi/ec.c
@@ -16,7 +16,7 @@
.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
};
- printk(BIOS_DEBUG, "mainboard_ec_init\n");
+ printk(BIOS_DEBUG, "%s\n", __func__);
post_code(0xf0);
google_chromeec_events_init(&info, s3_wakeup);
diff --git a/src/mainboard/google/slippy/ec.c b/src/mainboard/google/slippy/ec.c
index a3ee95b..2334cb61 100644
--- a/src/mainboard/google/slippy/ec.c
+++ b/src/mainboard/google/slippy/ec.c
@@ -16,7 +16,7 @@
int s3_wakeup = acpi_is_wakeup_s3();
- printk(BIOS_DEBUG, "mainboard_ec_init\n");
+ printk(BIOS_DEBUG, "%s\n", __func__);
post_code(0xf0);
google_chromeec_events_init(&info, s3_wakeup);
diff --git a/src/mainboard/samsung/lumpy/ec.c b/src/mainboard/samsung/lumpy/ec.c
index 7aac479..c768b0b 100644
--- a/src/mainboard/samsung/lumpy/ec.c
+++ b/src/mainboard/samsung/lumpy/ec.c
@@ -7,7 +7,7 @@
void lumpy_ec_init(void)
{
- printk(BIOS_DEBUG, "lumpy_ec_init\n");
+ printk(BIOS_DEBUG, "%s\n", __func__);
if (acpi_is_wakeup_s3())
return;