From 9359f578084a952d4977458083e0a2e4019dc2f8 Mon Sep 17 00:00:00 2001
From: Marcin Szkudlinski <marcin.szkudlinski@intel.com>
Date: Thu, 24 Aug 2023 15:27:30 +0200
Subject: [PATCH] Revert "audio: add fixup for S24_3LE"

This reverts commit 6efab4a7ab3f666b4a36c9d0f60e83003b69906b.
---
 src/audio/Kconfig                    |  6 ------
 src/include/sof/audio/audio_stream.h | 11 ++++-------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/audio/Kconfig b/src/audio/Kconfig
index f9a617421..bdc26973a 100644
--- a/src/audio/Kconfig
+++ b/src/audio/Kconfig
@@ -573,12 +573,6 @@ config FORMAT_S24LE
 	help
 	  Support 24 bit processing data format with sign and in little endian format
 
-config FORMAT_S24_3LE
-	bool "Support S24_3LE"
-	default n
-	help
-	  Support packed 24 bit processing data format with sign and in little endian format
-
 config FORMAT_S32LE
 	bool "Support S32LE"
 	default y
diff --git a/src/include/sof/audio/audio_stream.h b/src/include/sof/audio/audio_stream.h
index ecfc63432..bf5de7f39 100644
--- a/src/include/sof/audio/audio_stream.h
+++ b/src/include/sof/audio/audio_stream.h
@@ -1055,13 +1055,10 @@ static inline void audio_stream_fmt_conversion(enum ipc4_bit_depth depth,
 		*valid_fmt = SOF_IPC_FRAME_U8;
 #endif /* CONFIG_FORMAT_U8 */
 
-	if (valid == 24) {
-#ifdef CONFIG_FORMAT_S24_3LE
-		if (depth == 24) {
-			*frame_fmt = SOF_IPC_FRAME_S24_3LE;
-			*valid_fmt = SOF_IPC_FRAME_S24_3LE;
-		}
-#endif
+	/* really 24_3LE */
+	if (valid == 24 && depth == 24) {
+		*frame_fmt = SOF_IPC_FRAME_S24_3LE;
+		*valid_fmt = SOF_IPC_FRAME_S24_3LE;
 	}
 
 	if (type == IPC4_TYPE_FLOAT && depth == 32) {