Remove leading spaces and dots in DMSG() messages

Some debug messages have various amounts of leading spaces and dots (.) probably in an attempt to better align the text. It is unreliable because debug traces include function names and line numbers, which introduce random offsets. Remove these characters. Signed-off-by: Jerome Forissier <[email protected]>
OP-TEE · Aug 23, 2017 · 0a7f5cf · 0a7f5cf
1 parent d1d4669
commit 0a7f5cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/core/arch/arm/kernel/pseudo_ta.c b/core/arch/arm/kernel/pseudo_ta.c
@@ -256,7 +256,7 @@ TEE_Result tee_ta_init_pseudo_ta_session(const TEE_UUID *uuid,
 	struct tee_ta_ctx *ctx;
 	const struct pseudo_ta_head *ta;
 
-	DMSG("   Lookup for pseudo TA %pUl", (void *)uuid);
+	DMSG("Lookup pseudo TA %pUl", (void *)uuid);
 
 	ta = &__start_ta_head_section;
 	while (true) {
@@ -268,7 +268,7 @@ TEE_Result tee_ta_init_pseudo_ta_session(const TEE_UUID *uuid,
 	}
 
 	/* Load a new TA and create a session */
-	DMSG("      Open %s", ta->name);
+	DMSG("Open %s", ta->name);
 	stc = calloc(1, sizeof(struct pseudo_ta_ctx));
 	if (!stc)
 		return TEE_ERROR_OUT_OF_MEMORY;
@@ -282,7 +282,7 @@ TEE_Result tee_ta_init_pseudo_ta_session(const TEE_UUID *uuid,
 	ctx->ops = &pseudo_ta_ops;
 	TAILQ_INSERT_TAIL(&tee_ctxes, ctx, link);
 
-	DMSG("      %s : %pUl", stc->pseudo_ta->name, (void *)&ctx->uuid);
+	DMSG("%s : %pUl", stc->pseudo_ta->name, (void *)&ctx->uuid);
 
 	return TEE_SUCCESS;
 }
diff --git a/core/kernel/tee_ta_manager.c b/core/kernel/tee_ta_manager.c
@@ -394,7 +394,7 @@ TEE_Result tee_ta_close_session(struct tee_ta_session *csess,
 	}
 
 	ctx = sess->ctx;
-	DMSG("   ... Destroy session");
+	DMSG("Destroy session");
 
 	tee_ta_set_busy(ctx);
 
@@ -420,7 +420,7 @@ TEE_Result tee_ta_close_session(struct tee_ta_session *csess,
 	keep_alive = (ctx->flags & TA_FLAG_INSTANCE_KEEP_ALIVE) &&
 			(ctx->flags & TA_FLAG_SINGLE_INSTANCE);
 	if (!ctx->ref_count && !keep_alive) {
-		DMSG("   ... Destroy TA ctx");
+		DMSG("Destroy TA ctx");
 
 		TAILQ_REMOVE(&tee_ctxes, ctx, link);
 		mutex_unlock(&tee_ta_mutex);
@@ -458,7 +458,7 @@ static TEE_Result tee_ta_init_session_with_context(struct tee_ta_ctx *ctx,
 	      (ctx->ref_count == 0)))
 		return TEE_ERROR_BUSY;
 
-	DMSG("   ... Re-open TA %pUl", (void *)&ctx->uuid);
+	DMSG("Re-open TA %pUl", (void *)&ctx->uuid);
 
 	ctx->ref_count++;
 	s->ctx = ctx;
@@ -605,7 +605,7 @@ TEE_Result tee_ta_invoke_command(TEE_ErrorOrigin *err,
 		return TEE_ERROR_BAD_PARAMETERS;
 
 	if (sess->ctx->panicked) {
-		DMSG("   Panicked !");
+		DMSG("Panicked !");
 		*err = TEE_ORIGIN_TEE;
 		return TEE_ERROR_TARGET_DEAD;
 	}
@@ -622,7 +622,7 @@ TEE_Result tee_ta_invoke_command(TEE_ErrorOrigin *err,
 
 	tee_ta_clear_busy(sess->ctx);
 	if (res != TEE_SUCCESS)
-		DMSG("  => Error: %x of %d\n", res, *err);
+		DMSG("Error: %x of %d\n", res, *err);
 	return res;
 }