--- initial
+++ final
@@ -1,29 +1,29 @@
 static bool dce110_validate_bandwidth(struct dc *dc, struct dc_state *context) {
   bool result = false;
-  dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS, "%s: start", __func__);
+  DC_LOG_BANDWIDTH_CALCS(dc->ctx->logger, "%s: start", __func__);
   if (bw_calcs(dc->ctx, dc->bw_dceip, dc->bw_vbios, context->res_ctx.pipe_ctx, dc->res_pool->pipe_count, &context->bw.dce)) result = true;
-  if (!result) dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_VALIDATION, "%s: %dx%d@%d Bandwidth validation failed!\n", __func__, context->streams[0]->timing.h_addressable, context->streams[0]->timing.v_addressable, context->streams[0]->timing.pix_clk_khz);
+  if (!result) DC_LOG_BANDWIDTH_VALIDATION(dc->ctx->logger, "%s: %dx%d@%d Bandwidth validation failed!\n", __func__, context->streams[0]->timing.h_addressable, context->streams[0]->timing.v_addressable, context->streams[0]->timing.pix_clk_khz);
   if (memcmp(&dc->current_state->bw.dce, &context->bw.dce, sizeof(context->bw.dce))) {
     struct log_entry log_entry;
     dm_logger_open(dc->ctx->logger, &log_entry, LOG_BANDWIDTH_CALCS);
     dm_logger_append(&log_entry,
                      "%s: finish,\n"
                      "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n"
                      "stutMark_b: %d stutMark_a: %d\n",
                      __func__, context->bw.dce.nbp_state_change_wm_ns[0].b_mark, context->bw.dce.nbp_state_change_wm_ns[0].a_mark, context->bw.dce.urgent_wm_ns[0].b_mark, context->bw.dce.urgent_wm_ns[0].a_mark, context->bw.dce.stutter_exit_wm_ns[0].b_mark, context->bw.dce.stutter_exit_wm_ns[0].a_mark);
     dm_logger_append(&log_entry,
                      "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n"
                      "stutMark_b: %d stutMark_a: %d\n",
                      context->bw.dce.nbp_state_change_wm_ns[1].b_mark, context->bw.dce.nbp_state_change_wm_ns[1].a_mark, context->bw.dce.urgent_wm_ns[1].b_mark, context->bw.dce.urgent_wm_ns[1].a_mark, context->bw.dce.stutter_exit_wm_ns[1].b_mark, context->bw.dce.stutter_exit_wm_ns[1].a_mark);
     dm_logger_append(&log_entry,
                      "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n"
                      "stutMark_b: %d stutMark_a: %d stutter_mode_enable: %d\n",
                      context->bw.dce.nbp_state_change_wm_ns[2].b_mark, context->bw.dce.nbp_state_change_wm_ns[2].a_mark, context->bw.dce.urgent_wm_ns[2].b_mark, context->bw.dce.urgent_wm_ns[2].a_mark, context->bw.dce.stutter_exit_wm_ns[2].b_mark, context->bw.dce.stutter_exit_wm_ns[2].a_mark, context->bw.dce.stutter_mode_enable);
     dm_logger_append(&log_entry,
                      "cstate: %d pstate: %d nbpstate: %d sync: %d dispclk: %d\n"
                      "sclk: %d sclk_sleep: %d yclk: %d blackout_recovery_time_us: %d\n",
                      context->bw.dce.cpuc_state_change_enable, context->bw.dce.cpup_state_change_enable, context->bw.dce.nbp_state_change_enable, context->bw.dce.all_displays_in_sync, context->bw.dce.dispclk_khz, context->bw.dce.sclk_khz, context->bw.dce.sclk_deep_sleep_khz, context->bw.dce.yclk_khz, context->bw.dce.blackout_recovery_time_us);
     dm_logger_close(&log_entry);
   }
   return result;
 }<sep>@@
expression e1;
@@

- dm_logger_write(e1,LOG_BANDWIDTH_VALIDATION,
+ DC_LOG_BANDWIDTH_VALIDATION(e1,
	...)

@@
expression e1;
@@

- dm_logger_write(e1,LOG_BANDWIDTH_CALCS,
+ DC_LOG_BANDWIDTH_CALCS(e1,
	...)