1 files changed, 11 insertions, 11 deletions

diff --git a/src/vendorcode/cavium/bdk/libdram/dram-tune-ddr3.c b/src/vendorcode/cavium/bdk/libdram/dram-tune-ddr3.c
index 291fe85567..ebbe836481 100644
--- a/src/vendorcode/cavium/bdk/libdram/dram-tune-ddr3.c
+++ b/src/vendorcode/cavium/bdk/libdram/dram-tune-ddr3.c
@@ -199,7 +199,7 @@ get_speed_bin(bdk_node_t node, int lmc)
     }
 
     debug_print("N%d.LMC%d: %s: returning bin %d for MTS %d\n",
-                node, lmc, __FUNCTION__, ret, mts_speed);
+                node, lmc, __func__, ret, mts_speed);
 
     return ret;
 }
@@ -857,9 +857,9 @@ auto_set_dll_offset(bdk_node_t node, int dll_offset_mode,
     // run the test one last time
     // print whether there are errors or not, but only when verbose...
     bdk_watchdog_poke();
-    debug_print("N%d: %s: Start running test one last time\n", node, __FUNCTION__);
+    debug_print("N%d: %s: Start running test one last time\n", node, __func__);
     tot_errors = run_dram_tuning_threads(node, num_lmcs, bytemask);
-    debug_print("N%d: %s: Finished running test one last time\n", node, __FUNCTION__);
+    debug_print("N%d: %s: Finished running test one last time\n", node, __func__);
     if (tot_errors)
         ddr_print2("%s Timing Final Test: errors 0x%x\n", mode_str, tot_errors);
 
@@ -893,7 +893,7 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
     orig_coremask = bdk_get_running_coremask(node);
     /* FIXME(dhendrix): %lx --> %llx */
     ddr_print4("N%d: %s: Starting cores (mask was 0x%llx)\n",
-              node, __FUNCTION__, orig_coremask);
+              node, __func__, orig_coremask);
         /* FIXME(dhendrix): don't call bdk_init_cores(). */
 //    bdk_init_cores(node, ~0ULL & ~orig_coremask);
     dram_tune_max_cores = bdk_get_num_running_cores(node);
@@ -979,7 +979,7 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
     ddr_interface_64b = !lmc_config.s.mode32b;
 
     // do setup for each active LMC
-    debug_print("N%d: %s: starting LMCs setup.\n", node, __FUNCTION__);
+    debug_print("N%d: %s: starting LMCs setup.\n", node, __func__);
     for (lmc = 0; lmc < num_lmcs; lmc++) {
 
 #if 0
@@ -1019,7 +1019,7 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
 #endif
 
     // perform cleanup on all active LMCs
-    debug_print("N%d: %s: starting LMCs cleanup.\n", node, __FUNCTION__);
+    debug_print("N%d: %s: starting LMCs cleanup.\n", node, __func__);
     for (lmc = 0; lmc < num_lmcs; lmc++) {
 
         /* Restore ECC for DRAM tests */
@@ -1066,12 +1066,12 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
     uint64_t reset_coremask = 0;
     if (reset_coremask) {
         /* FIXME(dhendrix): %lx --> %llx */
-        ddr_print4("N%d: %s: Stopping cores 0x%llx\n", node, __FUNCTION__,
+        ddr_print4("N%d: %s: Stopping cores 0x%llx\n", node, __func__,
                   reset_coremask);
         bdk_reset_cores(node, reset_coremask);
     } else {
         /* FIXME(dhendrix): %lx --> %llx */
-        ddr_print4("N%d: %s: leaving cores set to 0x%llx\n", node, __FUNCTION__,
+        ddr_print4("N%d: %s: leaving cores set to 0x%llx\n", node, __func__,
                   orig_coremask);
     }
 
@@ -1215,7 +1215,7 @@ run_best_hw_patterns(bdk_node_t node, int lmc, uint64_t phys_addr,
             setup_lfsr_pattern(node, lmc, 0);
             errors = test_dram_byte_hw(node, lmc, phys_addr, mode, xor_data);
             VB_PRT(VBL_DEV2, "%s: LFSR at A:0x%012llx errors 0x%x\n",
-                   __FUNCTION__, phys_addr, errors);
+                   __func__, phys_addr, errors);
     } else {
         for (pattern = 0; pattern < NUM_BYTE_PATTERNS; pattern++) {
             pattern_p = byte_patterns[pattern];
@@ -1224,7 +1224,7 @@ run_best_hw_patterns(bdk_node_t node, int lmc, uint64_t phys_addr,
             errs = test_dram_byte_hw(node, lmc, phys_addr, mode, xor_data);
 
             VB_PRT(VBL_DEV2, "%s: PATTERN %d at A:0x%012llx errors 0x%x\n",
-                   __FUNCTION__, pattern, phys_addr, errs);
+                   __func__, pattern, phys_addr, errs);
 
             errors |= errs;
         } /* for (pattern = 0; pattern < NUM_BYTE_PATTERNS; pattern++) */
@@ -1270,7 +1270,7 @@ hw_assist_test_dll_offset(bdk_node_t node, int dll_offset_mode,
     hw_rank_offset = 1ull << (28 + lmcx_config.s.pbank_lsb - lmcx_config.s.rank_ena + (num_lmcs/2));
 
     debug_print("N%d: %s: starting LMC%d with rank offset 0x%lx\n",
-                node, __FUNCTION__, lmc, hw_rank_offset);
+                node, __func__, lmc, hw_rank_offset);
 
     // start of pattern loop
     // we do the set of tests for each pattern supplied...