Merge "asoc: remove deprecated dummy functions in DAP modules"

asoc/msm-ds2-dap-config.c

@@ -22,8 +22,6 @@
 #include "msm-pcm-routing-v2.h"
 
 
-#if defined(CONFIG_DOLBY_DS2) || defined(CONFIG_DOLBY_LICENSE)
-
 /* ramp up/down for 30ms    */
 #define DOLBY_SOFT_VOLUME_PERIOD	40
 /* Step value 0ms or 0us */
@@ -2174,144 +2172,3 @@ int msm_ds2_dap_set_custom_stereo_onoff(int port_id, int copp_idx,
 	}
 	return rc;
 }
-
-#else
-
-static int msm_ds2_dap_alloc_and_store_cal_data(int dev_map_idx, int path,
-					    int perf_mode)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_free_cal_data(int dev_map_idx)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_send_cal_data(int dev_map_idx)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_can_enable_module(int32_t module_id)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_init_modules_in_topology(int dev_map_idx)
-{
-	return 0;
-}
-
-static bool msm_ds2_dap_check_is_param_modified(int32_t *dap_params_modified,
-				    int32_t idx, int32_t commit)
-{
-	return false;
-}
-
-
-static int msm_ds2_dap_map_device_to_dolby_cache_devices(int32_t device_id)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_update_num_devices(struct dolby_param_data *dolby_data,
-				      int32_t *num_device, int32_t *dev_arr,
-				      int32_t array_size)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_commit_params(struct dolby_param_data *dolby_data,
-				 int commit)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_handle_commands(u32 cmd, void *arg)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_set_param(u32 cmd, void *arg)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_get_param(u32 cmd, void *arg)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_send_end_point(int dev_map_idx, int endp_idx)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_send_cached_params(int dev_map_idx,
-					  int commit)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_set_vspe_vdhe(int dev_map_idx,
-				     bool is_custom_stereo_enabled)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_param_visualizer_control_get(
-			u32 cmd, void *arg,
-			struct msm_pcm_routing_bdai_data *bedais)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_set_security_control(u32 cmd, void *arg)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_update_dev_map_port_id(int32_t device_id, int port_id)
-{
-	return 0;
-}
-
-static int32_t msm_ds2_dap_get_port_id(
-		int32_t device_id, int32_t be_id)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_handle_bypass(struct dolby_param_data *dolby_data)
-{
-	return 0;
-}
-
-static int msm_ds2_dap_handle_bypass_wait(int port_id, int copp_idx,
-					  int wait_time)
-{
-	return 0;
-}
-
-static int dap_set_custom_stereo_onoff(int dev_map_idx,
-					bool is_custom_stereo_enabled)
-{
-	return 0;
-}
-int qti_set_custom_stereo_on(int port_id, int copp_idx,
-			     bool is_custom_stereo_on)
-{
-	return 0;
-}
-int set_custom_stereo_onoff(int dev_map_idx,
-			    bool is_custom_stereo_enabled)
-{
-	return 0;
-}
-int msm_ds2_dap_ioctl_shared(struct snd_hwdep *hw, struct file *file,
-			     u32 cmd, void *arg)
-{
-	return 0;
-}
-#endif /* CONFIG_DOLBY_DS2 || CONFIG_DOLBY_LICENSE */