Changeset 1401 for trunk

Timestamp:

07/29/11 22:13:45 (10 months ago)

Author:

uwe

Message:

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.

Signed-off-by: Uwe Hermann <uwe@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/it85spi.c (modified) (9 diffs)

trunk/it85spi.c

@@ -115 +115 @@
         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;
@@ -132 +132 @@
                 if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
                              "* timeout at waiting for IBF==0.\n",
-                             __FUNCTION__, __LINE__))
+                             __func__, __LINE__))
                         continue;
 
@@ -141 +141 @@
                 if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
                              "* timeout at taking command.\n",
-                             __FUNCTION__, __LINE__))
+                             __func__, __LINE__))
                         continue;
 
@@ -149 +149 @@
                 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;
                 }
@@ -162 +162 @@
                 /* 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__);
         }
 }
@@ -176 +175 @@
         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;
@@ -184 +183 @@
                 if (wait_for(KB_IBF, 0, MAX_TIMEOUT,
                              "* timeout at waiting for IBF==0.\n",
-                             __FUNCTION__, __LINE__))
+                             __func__, __LINE__))
                         continue;
 
@@ -193 +192 @@
                 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
@@ -206 +205 @@
         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__);
         }