From e187d5e1753100b03226ff306d0ff91c41c4ff70 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 29 Jul 2011 20:13:45 +0000 Subject: Use __func__ instead of __FUNCTION__ as we do elsewhere The __func__ variant is standardized in C99 and recommended to be used instead of __FUNCTION__ in the gcc info page. See also r711 where we did the same change. Corresponding to flashrom svn r1401. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann --- it85spi.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'it85spi.c') diff --git a/it85spi.c b/it85spi.c index f56d7bd..76e4861 100644 --- a/it85spi.c +++ b/it85spi.c @@ -114,7 +114,7 @@ void it85xx_enter_scratch_rom(void) { int ret, tries; - msg_pdbg("%s():%d was called ...\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d was called ...\n", __func__, __LINE__); if (it85xx_scratch_rom_reenter > 0) return; @@ -131,7 +131,7 @@ void it85xx_enter_scratch_rom(void) /* Wait until IBF (input buffer) is not full. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at waiting for IBF==0.\n", - __FUNCTION__, __LINE__)) + __func__, __LINE__)) continue; /* Copy EC firmware to SRAM. */ @@ -140,7 +140,7 @@ void it85xx_enter_scratch_rom(void) /* Confirm EC has taken away the command. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at taking command.\n", - __FUNCTION__, __LINE__)) + __func__, __LINE__)) continue; /* Waiting for OBF (output buffer) has data. @@ -148,12 +148,12 @@ void it85xx_enter_scratch_rom(void) * ISR so that it is okay as long as the command is 0xFA. */ if (wait_for(KB_OBF, KB_OBF, MAX_TIMEOUT, NULL, NULL, 0)) msg_pdbg("%s():%d * timeout at waiting for OBF.\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); if ((ret = INB(LEGACY_KBC_PORT_DATA)) == 0xFA) { break; } else { msg_perr("%s():%d * not run on SRAM ret=%d\n", - __FUNCTION__, __LINE__, ret); + __func__, __LINE__, ret); continue; } } @@ -161,10 +161,9 @@ void it85xx_enter_scratch_rom(void) if (tries < MAX_TRY) { /* EC already runs on SRAM */ it85xx_scratch_rom_reenter++; - msg_pdbg("%s():%d * SUCCESS.\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d * SUCCESS.\n", __func__, __LINE__); } else { - msg_perr("%s():%d * Max try reached.\n", - __FUNCTION__, __LINE__); + msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__); } } @@ -175,7 +174,7 @@ void it85xx_exit_scratch_rom(void) #endif int tries; - msg_pdbg("%s():%d was called ...\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d was called ...\n", __func__, __LINE__); if (it85xx_scratch_rom_reenter <= 0) return; @@ -183,7 +182,7 @@ void it85xx_exit_scratch_rom(void) /* Wait until IBF (input buffer) is not full. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at waiting for IBF==0.\n", - __FUNCTION__, __LINE__)) + __func__, __LINE__)) continue; /* Exit SRAM. Run on flash. */ @@ -192,7 +191,7 @@ void it85xx_exit_scratch_rom(void) /* Confirm EC has taken away the command. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at taking command.\n", - __FUNCTION__, __LINE__)) { + __func__, __LINE__)) { /* We cannot ensure if EC has exited update mode. * If EC is in normal mode already, a further 0xFE * command will reboot system. So, exit loop here. */ @@ -205,10 +204,9 @@ void it85xx_exit_scratch_rom(void) if (tries < MAX_TRY) { it85xx_scratch_rom_reenter = 0; - msg_pdbg("%s():%d * SUCCESS.\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d * SUCCESS.\n", __func__, __LINE__); } else { - msg_perr("%s():%d * Max try reached.\n", - __FUNCTION__, __LINE__); + msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__); } #if 0 -- cgit v1.1