From f3163c958ad460d0b541eab83f54deb4dab4671e Mon Sep 17 00:00:00 2001
From: Paul Olaru <paul.olaru@nxp.com>
Date: Tue, 29 Oct 2019 15:50:47 +0200
Subject: [PATCH] sof: spinlock: Fix several compile errors related to spinlock
 debug

src/include/sof/schedule/ll_schedule_domain.h: In function 'domain_init':
src/include/sof/spinlock.h:87:9: error: 'domain->lock' is a pointer; did you mean to use '->'?
   (lock)->user = __LINE__; \
         ^~
src/include/sof/schedule/ll_schedule_domain.h:71:2: note: in expansion of macro 'spinlock_init'
  spinlock_init(&domain->lock);
  ^~~~~~~~~~~~~

Plus specific errors related to the platform, like:

src/platform/imx8/lib/dma.c: In function 'edma_init':
src/include/sof/spinlock.h:87:9: error: 'dma[i].lock' is a pointer; did you mean to use '->'?
   (lock)->user = __LINE__; \
         ^~
src/platform/imx8/lib/dma.c:54:3: note: in expansion of macro 'spinlock_init'
   spinlock_init(&dma[i].lock);
   ^~~~~~~~~~~~~

Signed-off-by: Paul Olaru <paul.olaru@nxp.com>
---
 src/arch/xtensa/init.c     | 1 +
 src/include/sof/spinlock.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/arch/xtensa/init.c b/src/arch/xtensa/init.c
index 96c823cb8..45ab0a620 100644
--- a/src/arch/xtensa/init.c
+++ b/src/arch/xtensa/init.c
@@ -15,6 +15,7 @@
 #include <sof/init.h>
 #include <sof/lib/cpu.h>
 #include <sof/sof.h>
+#include <sof/spinlock.h>
 #include <config.h>
 #include <xtensa/xtruntime-frames.h>
 #include <xtos-structs.h>
diff --git a/src/include/sof/spinlock.h b/src/include/sof/spinlock.h
index 4e72138a6..028d0b7a9 100644
--- a/src/include/sof/spinlock.h
+++ b/src/include/sof/spinlock.h
@@ -15,6 +15,7 @@
 
 #include <arch/spinlock.h>
 #include <sof/drivers/interrupt.h>
+#include <sof/trace/trace.h>
 #include <config.h>
 
 /*
@@ -84,7 +85,7 @@ extern uint32_t lock_dbg_user[DBG_LOCK_USERS];
 #define spinlock_init(lock) \
 	do { \
 		arch_spinlock_init(lock); \
-		(lock)->user = __LINE__; \
+		(*lock)->user = __LINE__; \
 	} while (0)
 
 /* panic on deadlock */