From a487ca9441fb5d8738565db377ef7d3ad85579ac Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Mon, 13 Sep 2021 21:00:00 +0000
Subject: [PATCH] Revert "dma-trace: add check to avoid dereference from NULL"

This reverts commit 89ec377cb55de04270dd6fa2bd8672c3dea3e83d.

As commit 7df367451d0f ("trace: enable trace after it is ready") is
reverted this is not required anymore. See long previous commit message.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 src/ipc/dma-copy.c                 | 8 --------
 src/platform/intel/cavs/platform.c | 4 +---
 src/trace/dma-trace.c              | 6 ++++--
 src/trace/trace.c                  | 3 ++-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c
index fd2730f73..ac2ecc345 100644
--- a/src/ipc/dma-copy.c
+++ b/src/ipc/dma-copy.c
@@ -64,10 +64,6 @@ int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
 {
 	int ret;
 
-	/* return if DMA channel is not get yet */
-	if (!dc->chan)
-		return -EINVAL;
-
 	/* tell gateway to copy */
 	ret = dma_copy(dc->chan, size, 0);
 	if (ret < 0)
@@ -89,10 +85,6 @@ int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
 	int32_t err;
 	int32_t offset = host_offset;
 
-	/* return if DMA channel is not get yet */
-	if (!dc->chan)
-		return -EINVAL;
-
 	if (size <= 0)
 		return 0;
 
diff --git a/src/platform/intel/cavs/platform.c b/src/platform/intel/cavs/platform.c
index 3d7db4b2b..66093ac2a 100644
--- a/src/platform/intel/cavs/platform.c
+++ b/src/platform/intel/cavs/platform.c
@@ -524,9 +524,7 @@ int platform_init(struct sof *sof)
 #elif CONFIG_TRACE
 	/* Initialize DMA for Trace*/
 	trace_point(TRACE_BOOT_PLATFORM_DMA_TRACE);
-	ret = dma_trace_init_complete(sof->dmat);
-	if (ret < 0)
-		return ret;
+	dma_trace_init_complete(sof->dmat);
 #endif
 
 	/* show heap status */
diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
index 3c5bbdfb1..d113443f2 100644
--- a/src/trace/dma-trace.c
+++ b/src/trace/dma-trace.c
@@ -477,8 +477,9 @@ void dma_trace_on(void)
 {
 	struct dma_trace_data *trace_data = dma_trace_data_get();
 
-	if (!trace_data || trace_data->enabled)
+	if (trace_data->enabled) {
 		return;
+	}
 
 	trace_data->enabled = 1;
 	schedule_task(&trace_data->dmat_work, DMA_TRACE_PERIOD,
@@ -490,8 +491,9 @@ void dma_trace_off(void)
 {
 	struct dma_trace_data *trace_data = dma_trace_data_get();
 
-	if (!trace_data || !trace_data->enabled)
+	if (!trace_data->enabled) {
 		return;
+	}
 
 	schedule_task_cancel(&trace_data->dmat_work);
 	trace_data->enabled = 0;
diff --git a/src/trace/trace.c b/src/trace/trace.c
index 866ff0af4..f31fb3a1c 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -272,8 +272,9 @@ void trace_log_unfiltered(bool send_atomic, const void *log_entry, const struct
 	struct trace *trace = trace_get();
 	va_list vl;
 
-	if (!trace || !trace->enable)
+	if (!trace->enable) {
 		return;
+	}
 
 	va_start(vl, arg_count);
 	vatrace_log(send_atomic, (uint32_t)log_entry, ctx, lvl, id_1, id_2, arg_count, vl);