From a63f8be985e508d3bacba7bb1df80fee2dd4eb58 Mon Sep 17 00:00:00 2001 From: Xiaoyu Ye Date: Tue, 12 Sep 2017 16:51:26 -0700 Subject: [PATCH] ASoC: msm: fix compilation errors when CONFIG_QTI_PP is disabled Add dummy static inline functions for feature QTI_PP to fix compilation erros for undefined function when flag 'CONFIG_QTI_PP' is not defined. Change-Id: I24c29636755f44a80b2a0267e0dbb8f72d6a3c9d Signed-off-by: Xiaoyu Ye --- asoc/msm-qti-pp-config.h | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/asoc/msm-qti-pp-config.h b/asoc/msm-qti-pp-config.h index ade2f5e507ec..3bf97b479e84 100644 --- a/asoc/msm-qti-pp-config.h +++ b/asoc/msm-qti-pp-config.h @@ -15,6 +15,7 @@ #include #define DSP_BIT_WIDTH_MIXER_CTL "ASM Bit Width" +#ifdef CONFIG_QTI_PP int msm_adsp_inform_mixer_ctl(struct snd_soc_pcm_runtime *rtd, uint32_t *payload); int msm_adsp_init_mixer_ctl_pp_event_queue(struct snd_soc_pcm_runtime *rtd); @@ -25,7 +26,6 @@ int msm_adsp_stream_callback_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int msm_adsp_stream_callback_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); -#ifdef CONFIG_QTI_PP void msm_qti_pp_send_eq_values(int fedai_id); int msm_qti_pp_send_stereo_to_custom_stereo_cmd(int port_id, int copp_idx, unsigned int session_id, @@ -35,6 +35,42 @@ int msm_qti_pp_send_stereo_to_custom_stereo_cmd(int port_id, int copp_idx, uint16_t op_FR_ip_FR_weight); void msm_qti_pp_add_controls(struct snd_soc_platform *platform); #else /* CONFIG_QTI_PP */ +static inline int msm_adsp_inform_mixer_ctl(struct snd_soc_pcm_runtime *rtd, + uint32_t *payload) +{ + return 0; +} + +static inline int msm_adsp_init_mixer_ctl_pp_event_queue( + struct snd_soc_pcm_runtime *rtd) +{ + return 0; +} + +static inline int msm_adsp_clean_mixer_ctl_pp_event_queue( + struct snd_soc_pcm_runtime *rtd) +{ + return 0; +} + +static inline int msm_adsp_stream_cmd_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return 0; +} + +static inline int msm_adsp_stream_callback_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return 0; +} + +static inline int msm_adsp_stream_callback_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + return 0; +} + #define msm_qti_pp_send_eq_values(fedai_id) do {} while (0) #define msm_qti_pp_send_stereo_to_custom_stereo_cmd(port_id, copp_idx, \ session_id, op_FL_ip_FL_weight, op_FL_ip_FR_weight, \