Trace: remove atomic trace context dependency

Remove context dependency from four atomic trace definition.

Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>

Author: btian1

posix/include/rtos/spinlock.h

@@ -88,9 +88,9 @@ extern struct tr_ctx sl_tr;
 				break;	/* lock acquired */ \
 		} \
 		if (__tries == 0) { \
-			tr_err_atomic(&sl_tr, "DED"); \
-			tr_err_atomic(&sl_tr, "line: %d", line); \
-			tr_err_atomic(&sl_tr, "user: %d", (lock)->user); \
+			tr_err_atomic("DED"); \
+			tr_err_atomic("line: %d", line); \
+			tr_err_atomic("user: %d", (lock)->user); \
 			panic(SOF_IPC_PANIC_DEADLOCK); /* lock not acquired */ \
 		} \
 	} while (0)
@@ -102,11 +102,11 @@ extern struct tr_ctx sl_tr;
 			int __i = 0; \
 			int  __count = lock_dbg_atomic >= DBG_LOCK_USERS \
 				? DBG_LOCK_USERS : lock_dbg_atomic; \
-			tr_err_atomic(&sl_tr, "eal"); \
-			tr_err_atomic(&sl_tr, "line: %d", line); \
-			tr_err_atomic(&sl_tr, "dbg_atomic: %d", lock_dbg_atomic); \
+			tr_err_atomic("eal"); \
+			tr_err_atomic("line: %d", line); \
+			tr_err_atomic("dbg_atomic: %d", lock_dbg_atomic); \
 			for (__i = 0; __i < __count; __i++) { \
-				tr_err_atomic(&sl_tr, "value: %d", \
+				tr_err_atomic("value: %d", \
 					      (lock_dbg_atomic << 24) | \
 					      lock_dbg_user[__i]); \
 			} \

posix/include/rtos/wait.h

@@ -32,7 +32,7 @@ static inline void wait_for_interrupt(int level)
 	tr_dbg(&wait_tr, "WFE");
 #if CONFIG_DEBUG_LOCKS
 	if (lock_dbg_atomic)
-		tr_err_atomic(&wait_tr, "atm");
+		tr_err_atomic("atm");
 #endif
 	platform_wait_for_interrupt(level);
 	tr_dbg(&wait_tr, "WFX");

src/include/sof/trace/trace.h

@@ -220,22 +220,22 @@ struct tr_ctx {
 
 /* tracing from infrastructure part */
 
-#define tr_err_atomic(ctx, fmt, ...) \
+#define tr_err_atomic(fmt, ...) \
 	trace_error_atomic_with_ids_nonzephyr(_TRACE_INV_CLASS,	\
 				    _TRACE_INV_ID, _TRACE_INV_ID, \
 				    fmt, ##__VA_ARGS__)
 
-#define tr_warn_atomic(ctx, fmt, ...) \
+#define tr_warn_atomic(fmt, ...) \
 	trace_warn_atomic_with_ids_nonzephyr(_TRACE_INV_CLASS,	\
 				   _TRACE_INV_ID, _TRACE_INV_ID, \
 				   fmt, ##__VA_ARGS__)
 
-#define tr_info_atomic(ctx, fmt, ...) \
+#define tr_info_atomic(fmt, ...) \
 	trace_event_atomic_with_ids_nonzephyr(_TRACE_INV_CLASS,	\
 				    _TRACE_INV_ID, _TRACE_INV_ID, \
 				    fmt, ##__VA_ARGS__)
 
-#define tr_dbg_atomic(ctx, fmt, ...) \
+#define tr_dbg_atomic(fmt, ...) \
 	tracev_event_atomic_with_ids_nonzephyr(_TRACE_INV_CLASS,	\
 				     _TRACE_INV_ID, _TRACE_INV_ID, \
 				     fmt, ##__VA_ARGS__)

src/trace/dma-trace.c

@@ -491,7 +491,7 @@ int dma_trace_enable(struct dma_trace_data *d)
 
 	/* validate DMA context */
 	if (!d->dc.dmac || !d->dc.chan) {
-		tr_err_atomic(&dt_tr, "dma_trace_enable(): not valid");
+		tr_err_atomic("dma_trace_enable(): not valid");
 		err = -ENODEV;
 		goto out;
 	}

xtos/include/rtos/spinlock.h

@@ -88,9 +88,9 @@ extern struct tr_ctx sl_tr;
 				break;	/* lock acquired */ \
 		} \
 		if (__tries == 0) { \
-			tr_err_atomic(&sl_tr, "DED"); \
-			tr_err_atomic(&sl_tr, "line: %d", line); \
-			tr_err_atomic(&sl_tr, "user: %d", (lock)->user); \
+			tr_err_atomic("DED"); \
+			tr_err_atomic("line: %d", line); \
+			tr_err_atomic("user: %d", (lock)->user); \
 			panic(SOF_IPC_PANIC_DEADLOCK); /* lock not acquired */ \
 		} \
 	} while (0)
@@ -102,11 +102,11 @@ extern struct tr_ctx sl_tr;
 			int __i = 0; \
 			int  __count = lock_dbg_atomic >= DBG_LOCK_USERS \
 				? DBG_LOCK_USERS : lock_dbg_atomic; \
-			tr_err_atomic(&sl_tr, "eal"); \
-			tr_err_atomic(&sl_tr, "line: %d", line); \
-			tr_err_atomic(&sl_tr, "dbg_atomic: %d", lock_dbg_atomic); \
+			tr_err_atomic("eal"); \
+			tr_err_atomic("line: %d", line); \
+			tr_err_atomic("dbg_atomic: %d", lock_dbg_atomic); \
 			for (__i = 0; __i < __count; __i++) { \
-				tr_err_atomic(&sl_tr, "value: %d", \
+				tr_err_atomic("value: %d", \
 					      (lock_dbg_atomic << 24) | \
 					      lock_dbg_user[__i]); \
 			} \

xtos/include/rtos/wait.h

@@ -32,7 +32,7 @@ static inline void wait_for_interrupt(int level)
 	tr_dbg(&wait_tr, "WFE");
 #if CONFIG_DEBUG_LOCKS
 	if (lock_dbg_atomic)
-		tr_err_atomic(&wait_tr, "atm");
+		tr_err_atomic("atm");
 #endif
 	platform_wait_for_interrupt(level);
 	tr_dbg(&wait_tr, "WFX");