openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Use __func__ instead of __FUNCTION__ as we do elsewhere

Browse Source 
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 <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Uwe Hermann 2011-07-29 20:13:45 +00:00
parent 21b10c67ed
commit e187d5e175
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
it85spi.c
View File

@ -114,7 +114,7 @@ void it85xx_enter_scratch_rom(void)
{ {
int ret, tries; 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) if (it85xx_scratch_rom_reenter > 0)
return; return;
@ -131,7 +131,7 @@ void it85xx_enter_scratch_rom(void)
/* Wait until IBF (input buffer) is not full. */ /* Wait until IBF (input buffer) is not full. */
if (wait_for(KB_IBF, 0, MAX_TIMEOUT, if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
"* timeout at waiting for IBF==0.\n", "* timeout at waiting for IBF==0.\n",
__FUNCTION__, __LINE__)) __func__, __LINE__))
continue; continue;
/* Copy EC firmware to SRAM. */ /* Copy EC firmware to SRAM. */
@ -140,7 +140,7 @@ void it85xx_enter_scratch_rom(void)
/* Confirm EC has taken away the command. */ /* Confirm EC has taken away the command. */
if (wait_for(KB_IBF, 0, MAX_TIMEOUT, if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
"* timeout at taking command.\n", "* timeout at taking command.\n",
__FUNCTION__, __LINE__)) __func__, __LINE__))
continue; continue;
/* Waiting for OBF (output buffer) has data. /* 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. */ * 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)) if (wait_for(KB_OBF, KB_OBF, MAX_TIMEOUT, NULL, NULL, 0))
msg_pdbg("%s():%d * timeout at waiting for OBF.\n", msg_pdbg("%s():%d * timeout at waiting for OBF.\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
if ((ret = INB(LEGACY_KBC_PORT_DATA)) == 0xFA) { if ((ret = INB(LEGACY_KBC_PORT_DATA)) == 0xFA) {
break; break;
} else { } else {
msg_perr("%s():%d * not run on SRAM ret=%d\n", msg_perr("%s():%d * not run on SRAM ret=%d\n",
__FUNCTION__, __LINE__, ret); __func__, __LINE__, ret);
continue; continue;
} }
} }
@ -161,10 +161,9 @@ void it85xx_enter_scratch_rom(void)
if (tries < MAX_TRY) { if (tries < MAX_TRY) {
/* EC already runs on SRAM */ /* EC already runs on SRAM */
it85xx_scratch_rom_reenter++; it85xx_scratch_rom_reenter++;
msg_pdbg("%s():%d * SUCCESS.\n", __FUNCTION__, __LINE__); msg_pdbg("%s():%d * SUCCESS.\n", __func__, __LINE__);
} else { } else {
msg_perr("%s():%d * Max try reached.\n", msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__);
__FUNCTION__, __LINE__);
} }
} }
@ -175,7 +174,7 @@ void it85xx_exit_scratch_rom(void)
#endif #endif
int tries; 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) if (it85xx_scratch_rom_reenter <= 0)
return; return;
@ -183,7 +182,7 @@ void it85xx_exit_scratch_rom(void)
/* Wait until IBF (input buffer) is not full. */ /* Wait until IBF (input buffer) is not full. */
if (wait_for(KB_IBF, 0, MAX_TIMEOUT, if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
"* timeout at waiting for IBF==0.\n", "* timeout at waiting for IBF==0.\n",
__FUNCTION__, __LINE__)) __func__, __LINE__))
continue; continue;
/* Exit SRAM. Run on flash. */ /* Exit SRAM. Run on flash. */
@ -192,7 +191,7 @@ void it85xx_exit_scratch_rom(void)
/* Confirm EC has taken away the command. */ /* Confirm EC has taken away the command. */
if (wait_for(KB_IBF, 0, MAX_TIMEOUT, if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
"* timeout at taking command.\n", "* timeout at taking command.\n",
__FUNCTION__, __LINE__)) { __func__, __LINE__)) {
/* We cannot ensure if EC has exited update mode. /* We cannot ensure if EC has exited update mode.
* If EC is in normal mode already, a further 0xFE * If EC is in normal mode already, a further 0xFE
* command will reboot system. So, exit loop here. */ * command will reboot system. So, exit loop here. */
@ -205,10 +204,9 @@ void it85xx_exit_scratch_rom(void)
if (tries < MAX_TRY) { if (tries < MAX_TRY) {
it85xx_scratch_rom_reenter = 0; it85xx_scratch_rom_reenter = 0;
msg_pdbg("%s():%d * SUCCESS.\n", __FUNCTION__, __LINE__); msg_pdbg("%s():%d * SUCCESS.\n", __func__, __LINE__);
} else { } else {
msg_perr("%s():%d * Max try reached.\n", msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__);
__FUNCTION__, __LINE__);
} }
#if 0 #if 0