asoc: fix compilation issue
Initialize some uninitlaized variable and correct some log.
Change-Id: Ibd29a423450f6470e99941a7f3970128d11d9197
Signed-off-by: Xiao Li <lixiao@codeaurora.org>
diff --git a/asoc/codecs/bolero/bolero-cdc.c b/asoc/codecs/bolero/bolero-cdc.c
index 53640a2..6d1887e 100644
--- a/asoc/codecs/bolero/bolero-cdc.c
+++ b/asoc/codecs/bolero/bolero-cdc.c
@@ -654,7 +654,7 @@
priv->num_macros_registered++;
priv->macros_supported[macro_id] = true;
- dev_dbg(dev, "%s: register macro successful:%d\n", macro_id);
+ dev_dbg(dev, "%s: register macro successful:%d\n", __func__, macro_id);
if (priv->num_macros_registered == priv->num_macros) {
ret = bolero_copy_dais_from_macro(priv);
diff --git a/asoc/codecs/bolero/bolero-clk-rsc.c b/asoc/codecs/bolero/bolero-clk-rsc.c
index 7e28c5b..daed7e6 100644
--- a/asoc/codecs/bolero/bolero-clk-rsc.c
+++ b/asoc/codecs/bolero/bolero-clk-rsc.c
@@ -100,7 +100,7 @@
int count = 0;
if (!dev) {
- pr_err("%s: dev is null %d\n", __func__);
+ pr_err("%s: dev is null\n", __func__);
return -EINVAL;
}
@@ -147,7 +147,7 @@
int i = 0;
if (!dev) {
- pr_err("%s: dev is null %d\n", __func__);
+ pr_err("%s: dev is null\n", __func__);
return;
}
@@ -439,7 +439,7 @@
struct bolero_clk_rsc *priv = NULL;
if (!dev) {
- pr_err("%s: dev is null %d\n", __func__);
+ pr_err("%s: dev is null\n", __func__);
return;
}
clk_dev = bolero_get_rsc_clk_device_ptr(dev->parent);
@@ -514,7 +514,7 @@
bool mux_switch = false;
if (!dev) {
- pr_err("%s: dev is null %d\n", __func__);
+ pr_err("%s: dev is null\n", __func__);
return -EINVAL;
}
if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) &&
diff --git a/asoc/codecs/bolero/rx-macro.c b/asoc/codecs/bolero/rx-macro.c
index 22ddf3f..1c17d7c 100644
--- a/asoc/codecs/bolero/rx-macro.c
+++ b/asoc/codecs/bolero/rx-macro.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@@ -1120,7 +1120,7 @@
*rx_slot = ch_mask;
*rx_num = rx_priv->active_ch_cnt[dai->id];
dev_dbg(rx_priv->dev,
- "%s: dai->id:%d, ch_mask:0x%x, active_ch_cnt:%d active_mask: 0x%x\n",
+ "%s: dai->id:%d, ch_mask:0x%x, active_ch_cnt:%d active_mask: 0x%lx\n",
__func__, dai->id, *rx_slot, *rx_num, rx_priv->active_ch_mask[dai->id]);
break;
case RX_MACRO_AIF_ECHO:
diff --git a/asoc/codecs/wcd938x/wcd938x-slave.c b/asoc/codecs/wcd938x/wcd938x-slave.c
index 75cc783..1f83b4c 100644
--- a/asoc/codecs/wcd938x/wcd938x-slave.c
+++ b/asoc/codecs/wcd938x/wcd938x-slave.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@@ -287,7 +287,7 @@
ret = swr_get_logical_dev_num(pdev, pdev->addr, &devnum);
if (ret) {
dev_dbg(&pdev->dev,
- "%s get devnum %d for dev addr %lx failed\n",
+ "%s get devnum %d for dev addr %llx failed\n",
__func__, devnum, pdev->addr);
return ret;
}
diff --git a/asoc/codecs/wcd938x/wcd938x.c b/asoc/codecs/wcd938x/wcd938x.c
index faa264f..99e15be 100644
--- a/asoc/codecs/wcd938x/wcd938x.c
+++ b/asoc/codecs/wcd938x/wcd938x.c
@@ -1958,7 +1958,7 @@
ret = swr_get_logical_dev_num(swr_dev, swr_dev->addr, &devnum);
if (ret) {
dev_err(&swr_dev->dev,
- "%s get devnum %d for dev addr %lx failed\n",
+ "%s get devnum %d for dev addr %llx failed\n",
__func__, devnum, swr_dev->addr);
/* retry after 1ms */
usleep_range(1000, 1010);
diff --git a/asoc/codecs/wsa881x.c b/asoc/codecs/wsa881x.c
index fc4f123..11d5c3f 100644
--- a/asoc/codecs/wsa881x.c
+++ b/asoc/codecs/wsa881x.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@@ -1232,7 +1232,7 @@
}
if (retry == 0) {
dev_err(component->dev,
- "%s get devnum %d for dev addr %lx failed\n",
+ "%s get devnum %d for dev addr %llx failed\n",
__func__, devnum, dev->addr);
return -EINVAL;
}
@@ -1479,7 +1479,7 @@
ret = swr_get_logical_dev_num(pdev, pdev->addr, &devnum);
if (ret) {
dev_dbg(&pdev->dev,
- "%s get devnum %d for dev addr %lx failed\n",
+ "%s get devnum %d for dev addr %llx failed\n",
__func__, devnum, pdev->addr);
goto dev_err;
}
diff --git a/asoc/kona.c b/asoc/kona.c
index bbb7909..0272de5 100644
--- a/asoc/kona.c
+++ b/asoc/kona.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/clk.h>
@@ -7596,8 +7596,8 @@
u32 codec_max_aux_devs = 0;
u32 codec_aux_dev_cnt = 0;
int i;
- struct msm_wsa881x_dev_info *wsa881x_dev_info;
- struct aux_codec_dev_info *aux_cdc_dev_info;
+ struct msm_wsa881x_dev_info *wsa881x_dev_info = NULL;
+ struct aux_codec_dev_info *aux_cdc_dev_info = NULL;
const char *auxdev_name_prefix[1];
char *dev_name_str = NULL;
int found = 0;
diff --git a/asoc/msm-pcm-dtmf-v2.c b/asoc/msm-pcm-dtmf-v2.c
index 3dc7a26..a136102 100644
--- a/asoc/msm-pcm-dtmf-v2.c
+++ b/asoc/msm-pcm-dtmf-v2.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2013-2014, 2017-2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 2017-2020 The Linux Foundation. All rights reserved.
*/
#include <linux/init.h>
@@ -97,7 +97,7 @@
uint16_t gain = ucontrol->value.integer.value[3];
pr_debug("%s: low_freq=%d high_freq=%d duration=%lld gain=%d\n",
- __func__, low_freq, high_freq, (int)duration, gain);
+ __func__, low_freq, high_freq, duration, gain);
if (duration == DTMF_MAX_DURATION)
duration = -1;
diff --git a/dsp/q6lsm.c b/dsp/q6lsm.c
index 8df449e..66883ba 100644
--- a/dsp/q6lsm.c
+++ b/dsp/q6lsm.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2013-2019, Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2020, Linux Foundation. All rights reserved.
*/
#include <linux/fs.h>
#include <linux/mutex.h>
@@ -1098,7 +1098,7 @@
lsm_client_afe_data[n].fe_id = fe_id;
lsm_client_afe_data[n].unprocessed_data =
afe_data_format;
- pr_debug("%s: session ID is %d, fe_id is %d\n",
+ pr_debug("%s: session ID is %d, fe_id is %llu\n",
__func__, n, fe_id);
return 0;
}
@@ -1131,7 +1131,7 @@
if (fe_id == lsm_client_afe_data[n].fe_id) {
*afe_data_format =
lsm_client_afe_data[n].unprocessed_data;
- pr_debug("%s: session: %d, fe_id: %d, afe data: %s\n",
+ pr_debug("%s: session: %d, fe_id: %llu, afe data: %s\n",
__func__, n, fe_id,
*afe_data_format ? "unprocessed" : "processed");
return;
diff --git a/soc/pinctrl-lpi.c b/soc/pinctrl-lpi.c
index e69afdd..c3d2326 100644
--- a/soc/pinctrl-lpi.c
+++ b/soc/pinctrl-lpi.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/gpio.h>
@@ -691,7 +691,7 @@
}
} else {
slew_base = NULL;
- dev_dbg(dev, "error in reading lpi slew register: %d\n",
+ dev_dbg(dev, "%s: error in reading lpi slew register: %d\n",
__func__, ret);
}
diff --git a/soc/soundwire.c b/soc/soundwire.c
index 72a94ac..2aa3ba4 100644
--- a/soc/soundwire.c
+++ b/soc/soundwire.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/kernel.h>
@@ -126,7 +126,7 @@
list_add_tail(&swr->dev_list, &master->devices);
mutex_unlock(&master->mlock);
- dev_set_name(&swr->dev, "%s.%lx", swr->name, swr->addr);
+ dev_set_name(&swr->dev, "%s.%llx", swr->name, swr->addr);
result = device_register(&swr->dev);
if (result) {
dev_err(&master->dev, "device [%s] register failed err %d\n",
@@ -138,7 +138,7 @@
return swr;
err_out:
- dev_dbg(&master->dev, "Failed to register swr device %s at 0x%lx %d\n",
+ dev_dbg(&master->dev, "Failed to register swr device %s at 0x%llx %d\n",
swr->name, swr->addr, result);
swr_master_put(master);
kfree(swr);
diff --git a/soc/swr-mstr-ctrl.c b/soc/swr-mstr-ctrl.c
index 9052865..539f9b9 100644
--- a/soc/swr-mstr-ctrl.c
+++ b/soc/swr-mstr-ctrl.c
@@ -2211,7 +2211,7 @@
ret = 0;
}
dev_dbg(swrm->dev,
- "%s: devnum %d is assigned for dev addr %lx\n",
+ "%s: devnum %d is assigned for dev addr %llx\n",
__func__, i, swr_dev->addr);
}
}