summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Garberi <dade.garberi@gmail.com>2018-02-03 11:51:12 +0100
committerDavide Garberi <dade.garberi@gmail.com>2022-07-27 18:59:06 +0200
commit34d1c8aa38aa9c99068e5f685f48a2b27d450de3 (patch)
tree592ca0960e7c5b7ee61f6621048a93704673289b
parent0a879cf43309e447187f0fae3164cccecc017741 (diff)
sound: msm8996: Fix QUAT_MI2S_ENABLE ifdefs
* Without this patch if you disable QUAT_MI2S_ENABLE there will be the following warnings (turned in errors): sound/soc/msm/msm8996.c:1660:12: warning: 'msm_be_quat_hw_params_fixup' defined but not used [-Wunused-function] sound/soc/msm/msm8996.c:107:12: warning: 'msm_quat_mi2s_ch' defined but not used [-Wunused-variable] Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
-rw-r--r--sound/soc/msm/msm8996.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/msm/msm8996.c b/sound/soc/msm/msm8996.c
index 09a850817364..29084990932e 100644
--- a/sound/soc/msm/msm8996.c
+++ b/sound/soc/msm/msm8996.c
@@ -351,7 +351,9 @@ static int msm_hdmi_rx_ch = 2;
static int msm_proxy_rx_ch = 2;
static int hdmi_rx_sample_rate = SAMPLING_RATE_48KHZ;
static int msm_tert_mi2s_tx_ch = 2;
+#ifdef QUAT_MI2S_ENABLE
static int msm_quat_mi2s_ch = 2;
+#endif
static bool codec_reg_done;
@@ -4433,7 +4435,7 @@ static struct snd_soc_ops msm8996_quat_mi2s_be_ops = {
.startup = msm8996_quat_mi2s_startup,
.shutdown = msm8996_quat_mi2s_shutdown
};
-#endif
+
static int msm_be_quat_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params)
{
@@ -4448,6 +4450,7 @@ static int msm_be_quat_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
SNDRV_PCM_FORMAT_S16_LE);
return 0;
}
+#endif
static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params)