summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <invisiblek@cyanogenmod.org>2016-09-12 12:31:01 -0500
committerDan Pasanen <invisiblek@cyanogenmod.org>2016-09-12 14:03:42 -0500
commit98d99cecba566dd9d535d5c473092b0e0e3a2cac (patch)
tree977e5d90a1cbd2442c189cb9f072f20c6482509b
parentc37298d183eea20ca678373c883b61cc8cab4a24 (diff)
downloadhardware_qcom_audio-cm-14.0-caf-8994.tar.gz
hardware_qcom_audio-cm-14.0-caf-8994.tar.bz2
hardware_qcom_audio-cm-14.0-caf-8994.zip
audio_extn: dolby: fix warnings when compiling with clangcm-14.0-caf-8994
Change-Id: Ib2f00728258e366d07c62a33352ac23027ef5382
-rw-r--r--hal/audio_extn/dolby.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/hal/audio_extn/dolby.c b/hal/audio_extn/dolby.c
index cdfa2a1e..2f3614d9 100644
--- a/hal/audio_extn/dolby.c
+++ b/hal/audio_extn/dolby.c
@@ -633,9 +633,7 @@ static struct ds2_extn_module ds2extnmod = {
};
int audio_extn_dap_hal_init(int snd_card) {
- char c_dmid[128] = {0};
- void *handle = NULL;
- int i_dmid, ret = -EINVAL;
+ int ret = -EINVAL;
dap_hal_device_be_id_map_t device_be_id_map;
ALOGV("%s: opening DAP HAL lib\n", __func__);
@@ -654,7 +652,7 @@ int audio_extn_dap_hal_init(int snd_card) {
ds2extnmod.dap_hal_set_hw_info(SND_CARD, (void*)(&snd_card));
ALOGV("%s Sound card number is:%d",__func__,snd_card);
- platform_get_device_to_be_id_map(&device_be_id_map.device_id_to_be_id, &device_be_id_map.len);
+ platform_get_device_to_be_id_map((int**)&device_be_id_map.device_id_to_be_id, &device_be_id_map.len);
ds2extnmod.dap_hal_set_hw_info(DEVICE_BE_ID_MAP, (void*)(&device_be_id_map));
ALOGV("%s Set be id map len:%d",__func__,device_be_id_map.len);
ret = 0;
@@ -680,9 +678,7 @@ int audio_extn_dap_hal_deinit() {
void audio_extn_dolby_ds2_set_endpoint(struct audio_device *adev) {
struct listnode *node;
struct audio_usecase *usecase;
- struct mixer_ctl *ctl;
- const char *mixer_ctl_name = "DS1 DAP Endpoint";
- int endpoint = 0, ret;
+ int endpoint = 0;
bool send = false;
list_for_each(node, &adev->usecase_list) {
@@ -735,7 +731,7 @@ int audio_extn_ds2_enable(struct audio_device *adev) {
return 0;
}
-int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) {
+int audio_extn_dolby_set_dap_bypass(struct audio_device *adev __unused, int state) {
ALOGV("%s: state %d", __func__, state);
if (ds2extnmod.dap_hal_set_hw_info) {
@@ -747,12 +743,12 @@ int audio_extn_dolby_set_dap_bypass(struct audio_device *adev, int state) {
return 0;
}
-void audio_extn_dolby_set_license(struct audio_device *adev)
+void audio_extn_dolby_set_license(struct audio_device *adev __unused)
{
int i_key;
char c_key[128] = {0};
char c_dmid[128] = {0};
- int i_dmid, ret = -EINVAL;
+ int i_dmid;
struct dolby_param_license dolby_license;
#ifdef DOLBY_ACDB_LICENSE
@@ -771,16 +767,14 @@ void audio_extn_dolby_set_license(struct audio_device *adev)
ds2extnmod.dap_hal_set_hw_info(DMID, (void*)(&dolby_license.dmid));
} else {
ALOGV("%s: dap_hal_set_hw_info is NULL", __func__);
- return ret;
}
- return 0;
}
void audio_extn_ds2_set_parameters(struct audio_device *adev,
struct str_parms *parms)
{
- int val, ret;
+ int ret;
char value[32]={0};
ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_SND_CARD_STATUS, value,