diff --git a/arch/arm64/kvm/hyp/include/nvhe/spinlock.h b/arch/arm64/kvm/hyp/include/nvhe/spinlock.h
index 7c7ea8c55405..4652fd04bdbe 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/spinlock.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/spinlock.h
@@ -28,17 +28,9 @@ typedef union hyp_spinlock {
 	};
 } hyp_spinlock_t;
 
-#define __HYP_SPIN_LOCK_INITIALIZER \
-	{ .__val = 0 }
-
-#define __HYP_SPIN_LOCK_UNLOCKED \
-	((hyp_spinlock_t) __HYP_SPIN_LOCK_INITIALIZER)
-
-#define DEFINE_HYP_SPINLOCK(x)	hyp_spinlock_t x = __HYP_SPIN_LOCK_UNLOCKED
-
 #define hyp_spin_lock_init(l)						\
 do {									\
-	*(l) = __HYP_SPIN_LOCK_UNLOCKED;				\
+	*(l) = (hyp_spinlock_t){ .__val = 0 };				\
 } while (0)
 
 static inline void hyp_spin_lock(hyp_spinlock_t *lock)