From d8bb93c41bb116b22ae1deb79cbb672b5b5e4ecd Mon Sep 17 00:00:00 2001 From: Xiao Li Date: Tue, 7 Jan 2020 12:59:05 +0800 Subject: [PATCH] asoc: fix compilation issue Initialize some uninitlaized variable and correct some log. Change-Id: Ibd29a423450f6470e99941a7f3970128d11d9197 Signed-off-by: Xiao Li --- asoc/codecs/bolero/bolero-cdc.c | 2 +- asoc/codecs/bolero/bolero-clk-rsc.c | 8 ++++---- asoc/codecs/bolero/rx-macro.c | 4 ++-- asoc/codecs/wcd938x/wcd938x-slave.c | 4 ++-- asoc/codecs/wcd938x/wcd938x.c | 2 +- asoc/codecs/wsa881x.c | 6 +++--- asoc/kona.c | 6 +++--- asoc/msm-pcm-dtmf-v2.c | 4 ++-- dsp/q6lsm.c | 6 +++--- soc/pinctrl-lpi.c | 4 ++-- soc/soundwire.c | 6 +++--- soc/swr-mstr-ctrl.c | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/asoc/codecs/bolero/bolero-cdc.c b/asoc/codecs/bolero/bolero-cdc.c index 53640a23a09e..6d1887e0e0a8 100644 --- a/asoc/codecs/bolero/bolero-cdc.c +++ b/asoc/codecs/bolero/bolero-cdc.c @@ -654,7 +654,7 @@ int bolero_register_macro(struct device *dev, u16 macro_id, 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 7e28c5bfeb86..daed7e656684 100644 --- a/asoc/codecs/bolero/bolero-clk-rsc.c +++ b/asoc/codecs/bolero/bolero-clk-rsc.c @@ -100,7 +100,7 @@ int bolero_rsc_clk_reset(struct device *dev, int clk_id) 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 @@ void bolero_clk_rsc_enable_all_clocks(struct device *dev, bool enable) 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 @@ void bolero_clk_rsc_fs_gen_request(struct device *dev, bool enable) 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 @@ int bolero_clk_rsc_request_clock(struct device *dev, 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 22ddf3f88ecd..1c17d7ce617b 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 @@ -1120,7 +1120,7 @@ static int rx_macro_get_channel_map(struct snd_soc_dai *dai, *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 75cc7839c6d4..1f83b4ce1da5 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 @@ -287,7 +287,7 @@ static int wcd938x_slave_bind(struct device *dev, 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 faa264f92b59..99e15be4f3cf 100644 --- a/asoc/codecs/wcd938x/wcd938x.c +++ b/asoc/codecs/wcd938x/wcd938x.c @@ -1958,7 +1958,7 @@ static int wcd938x_get_logical_addr(struct swr_device *swr_dev) 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 fc4f12387be1..11d5c3f8e37d 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 @@ -1232,7 +1232,7 @@ static int32_t wsa881x_temp_reg_read(struct snd_soc_component *component, } 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 @@ static int wsa881x_swr_probe(struct swr_device *pdev) 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 bbb790983ae1..0272de53cd0a 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 @@ -7596,8 +7596,8 @@ static int msm_init_aux_dev(struct platform_device *pdev, 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 3dc7a26a54c8..a13610215b6c 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 @@ -97,7 +97,7 @@ static int msm_dtmf_rx_generate_put(struct snd_kcontrol *kcontrol, 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 8df449e499e7..66883ba77afb 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 #include @@ -1098,7 +1098,7 @@ int q6lsm_set_afe_data_format(uint64_t fe_id, uint16_t afe_data_format) 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 @@ void q6lsm_get_afe_data_format(uint64_t fe_id, uint16_t *afe_data_format) 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 e69afdd717dc..c3d2326af593 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 @@ -691,7 +691,7 @@ static int lpi_pinctrl_probe(struct platform_device *pdev) } } 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 72a94ace1482..2aa3ba4bdae0 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 @@ -126,7 +126,7 @@ struct swr_device *swr_new_device(struct swr_master *master, 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 @@ struct swr_device *swr_new_device(struct swr_master *master, 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 905286547970..539f9b935346 100644 --- a/soc/swr-mstr-ctrl.c +++ b/soc/swr-mstr-ctrl.c @@ -2211,7 +2211,7 @@ static int swrm_get_logical_dev_num(struct swr_master *mstr, u64 dev_id, 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); } }