From 5865f8c1828f3da84e10db349bd0cc3781e33db4 Mon Sep 17 00:00:00 2001
From: Meng Wang <mengw@codeaurora.org>
Date: Fri, 1 May 2020 15:33:17 +0800
Subject: [PATCH] asoc: remove asound.h from include list

There's no need to include sound/asound.h directly.
Remove it to work with KERNEL_HEADER_TEST and
UAPI_HEADER_TEST.

Change-Id: If09b58f683ad224b549f6f53dd34157ba0956ea4
Signed-off-by: Meng Wang <mengw@codeaurora.org>
---
 asoc/msm-pcm-routing-v2.c               | 1 -
 asoc/msm-qti-pp-config.c                | 1 -
 dsp/msm-dts-srs-tm-config.c             | 3 +--
 dsp/q6adm.c                             | 1 -
 include/uapi/audio/sound/lsm_params.h   | 1 -
 include/uapi/audio/sound/voice_params.h | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c
index a49a48cd88ce..4649d24c9910 100644
--- a/asoc/msm-pcm-routing-v2.c
+++ b/asoc/msm-pcm-routing-v2.c
@@ -18,7 +18,6 @@
 #include <sound/initval.h>
 #include <sound/control.h>
 #include <sound/tlv.h>
-#include <sound/asound.h>
 #include <sound/pcm_params.h>
 #include <sound/hwdep.h>
 #include <sound/audio_effects.h>
diff --git a/asoc/msm-qti-pp-config.c b/asoc/msm-qti-pp-config.c
index 1bafb20275b1..27faecbe1809 100644
--- a/asoc/msm-qti-pp-config.c
+++ b/asoc/msm-qti-pp-config.c
@@ -7,7 +7,6 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <sound/control.h>
-#include <sound/asound.h>
 #include <sound/tlv.h>
 #include <dsp/q6adm-v2.h>
 #include <dsp/q6asm-v2.h>
diff --git a/dsp/msm-dts-srs-tm-config.c b/dsp/msm-dts-srs-tm-config.c
index b507d02af7d9..54a3ab06b57f 100644
--- a/dsp/msm-dts-srs-tm-config.c
+++ b/dsp/msm-dts-srs-tm-config.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2014, 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, 2016-2018, 2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/err.h>
@@ -8,7 +8,6 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/atomic.h>
-#include <sound/asound.h>
 #include <sound/control.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6adm-v2.h>
diff --git a/dsp/q6adm.c b/dsp/q6adm.c
index 9a4a7f914a35..49f3934a9955 100644
--- a/dsp/q6adm.c
+++ b/dsp/q6adm.c
@@ -9,7 +9,6 @@
 #include <linux/jiffies.h>
 #include <linux/uaccess.h>
 #include <linux/atomic.h>
-#include <sound/asound.h>
 #include <dsp/msm-dts-srs-tm-config.h>
 #include <dsp/apr_audio-v2.h>
 #include <dsp/q6adm-v2.h>
diff --git a/include/uapi/audio/sound/lsm_params.h b/include/uapi/audio/sound/lsm_params.h
index 57dc3be5d454..c73a92fbd662 100644
--- a/include/uapi/audio/sound/lsm_params.h
+++ b/include/uapi/audio/sound/lsm_params.h
@@ -5,7 +5,6 @@
 #define LSM_EVENT_TIMESTAMP_MODE_SUPPORT
 
 #include <linux/types.h>
-#include <sound/asound.h>
 
 #define SNDRV_LSM_VERSION SNDRV_PROTOCOL_VERSION(0, 3, 1)
 
diff --git a/include/uapi/audio/sound/voice_params.h b/include/uapi/audio/sound/voice_params.h
index 43e3b9d0aa49..357a6fac3b18 100644
--- a/include/uapi/audio/sound/voice_params.h
+++ b/include/uapi/audio/sound/voice_params.h
@@ -2,7 +2,6 @@
 #define __VOICE_PARAMS_H__
 
 #include <linux/types.h>
-#include <sound/asound.h>
 
 enum voice_lch_mode {
 	VOICE_LCH_START = 1,