audio-kernel: fix compilation issues for pineapple target

Fix compilation issues in audio-kernel for pineapple target.

Change-Id: I93fa4fb670989f82139dd2cd0dbe57b52ad52504
Signed-off-by: Phani Kumar Uppalapati <quic_phaniu@quicinc.com>
This commit is contained in:
Phani Kumar Uppalapati
2022-11-18 11:58:05 -08:00
parent c2adcdf8a0
commit 5555970830
5 changed files with 11 additions and 13 deletions

View File

@@ -108,7 +108,7 @@ int lpass_cdc_rsc_clk_reset(struct device *dev, int clk_id)
int count = 0; int count = 0;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return -EINVAL; return -EINVAL;
} }
@@ -153,7 +153,7 @@ void lpass_cdc_clk_rsc_enable_all_clocks(struct device *dev, bool enable)
int i = 0; int i = 0;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return; return;
} }
@@ -401,7 +401,7 @@ void lpass_cdc_clk_rsc_fs_gen_request(struct device *dev, bool enable)
struct lpass_cdc_clk_rsc *priv = NULL; struct lpass_cdc_clk_rsc *priv = NULL;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return; return;
} }
clk_dev = lpass_cdc_get_rsc_clk_device_ptr(dev->parent); clk_dev = lpass_cdc_get_rsc_clk_device_ptr(dev->parent);
@@ -477,7 +477,7 @@ int lpass_cdc_clk_rsc_request_clock(struct device *dev,
bool mux_switch = false; bool mux_switch = false;
if (!dev) { if (!dev) {
pr_err("%s: dev is null %d\n", __func__); pr_err("%s: dev is null\n", __func__);
return -EINVAL; return -EINVAL;
} }
if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) && if ((clk_id_req < 0 || clk_id_req >= MAX_CLK) &&

View File

@@ -611,7 +611,7 @@ void msm_common_snd_shutdown(struct snd_pcm_substream *substream)
} }
} }
static void msm_audio_add_qos_request() static void msm_audio_add_qos_request(void)
{ {
int i; int i;
int cpu = 0; int cpu = 0;
@@ -642,7 +642,7 @@ static void msm_audio_add_qos_request()
} }
} }
static void msm_audio_remove_qos_request() static void msm_audio_remove_qos_request(void)
{ {
int cpu = 0; int cpu = 0;
int ret = 0; int ret = 0;
@@ -838,7 +838,7 @@ int msm_channel_map_get(struct snd_kcontrol *kcontrol,
ch_cnt = tx_ch_cnt; ch_cnt = tx_ch_cnt;
} }
if (ch_cnt > 2) { if (ch_cnt > 2) {
pr_err("%s: Incorrect channel count: %d\n", ch_cnt); pr_err("%s: Incorrect channel count: %d\n", __func__, ch_cnt);
return -EINVAL; return -EINVAL;
} }
len = sizeof(uint32_t) * (ch_cnt + 1); len = sizeof(uint32_t) * (ch_cnt + 1);
@@ -887,9 +887,7 @@ int msm_channel_map_get(struct snd_kcontrol *kcontrol,
/* reset return value from the loop above */ /* reset return value from the loop above */
ret = 0; ret = 0;
if (rx_ch_cnt == 0 && tx_ch_cnt == 0) { if (rx_ch_cnt == 0 && tx_ch_cnt == 0) {
pr_debug("%s: got incorrect channel map for backend_id:%d, ", pr_debug("%s: incorrect ch map for backend_id:%d, RX Channel Cnt:%d, TX Channel Cnt:%d\n",
"RX Channel Count:%d,"
"TX Channel Count:%d\n",
__func__, backend_id, rx_ch_cnt, tx_ch_cnt); __func__, backend_id, rx_ch_cnt, tx_ch_cnt);
return ret; return ret;
} }

View File

@@ -339,7 +339,7 @@ static int adsp_loader_probe(struct platform_device *pdev)
rproc_phandle = be32_to_cpup(prop->value); rproc_phandle = be32_to_cpup(prop->value);
adsp = rproc_get_by_phandle(rproc_phandle); adsp = rproc_get_by_phandle(rproc_phandle);
if (!adsp) { if (!adsp) {
dev_err(&pdev->dev, "fail to get rproc\n", __func__); dev_err(&pdev->dev, "fail to get rproc\n");
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }

View File

@@ -21,7 +21,7 @@
void *audio_ssr_register(const char *domain_name, struct notifier_block *nb) void *audio_ssr_register(const char *domain_name, struct notifier_block *nb)
{ {
if (domain_name == NULL) { if (domain_name == NULL) {
pr_err("%s: Invalid domain name %d\n", __func__); pr_err("%s: Invalid domain name\n", __func__);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }

View File

@@ -731,7 +731,7 @@ static int lpi_pinctrl_probe(struct platform_device *pdev)
} else { } else {
slew_base = NULL; slew_base = NULL;
dev_dbg(dev, "error in reading lpi slew register: %d\n", dev_dbg(dev, "error in reading lpi slew register: %d\n",
__func__, ret); ret);
} }
pindesc = devm_kcalloc(dev, npins, sizeof(*pindesc), GFP_KERNEL); pindesc = devm_kcalloc(dev, npins, sizeof(*pindesc), GFP_KERNEL);