From 39ead2c1e84efab0616a14a1e2858010a6c151ed Mon Sep 17 00:00:00 2001 From: Vatsal Bucha Date: Fri, 14 Dec 2018 12:22:46 +0530 Subject: [PATCH] ASoC: bolero: Remove unwanted logs at bootup Correct name of widgets for tx macro from TX SWR_MIC to TX SWR_DMIC. Also assign codec pointer to rx_priv before calling rx_macro_init_bcl_pmic_reg. Change-Id: I268d79413c53bcd2d8e7a391859b71b7a7e3f64e Signed-off-by: Vatsal Bucha --- asoc/codecs/bolero/rx-macro.c | 3 +-- asoc/codecs/bolero/tx-macro.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/asoc/codecs/bolero/rx-macro.c b/asoc/codecs/bolero/rx-macro.c index 637e9873999f..dcef1267e04b 100644 --- a/asoc/codecs/bolero/rx-macro.c +++ b/asoc/codecs/bolero/rx-macro.c @@ -3384,9 +3384,8 @@ static int rx_macro_init(struct snd_soc_component *component) snd_soc_component_update_bits(component, BOLERO_CDC_RX_RX2_RX_PATH_CFG3, 0x03, 0x02); - rx_macro_init_bcl_pmic_reg(component); - rx_priv->component = component; + rx_macro_init_bcl_pmic_reg(component); return 0; } diff --git a/asoc/codecs/bolero/tx-macro.c b/asoc/codecs/bolero/tx-macro.c index 0430307c8dfb..339929863fff 100644 --- a/asoc/codecs/bolero/tx-macro.c +++ b/asoc/codecs/bolero/tx-macro.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */ #include @@ -1563,14 +1563,14 @@ static int tx_macro_init(struct snd_soc_component *component) snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC1"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC2"); snd_soc_dapm_ignore_suspend(dapm, "TX SWR_ADC3"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC0"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC1"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC2"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC3"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC4"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC5"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC6"); - snd_soc_dapm_ignore_suspend(dapm, "TX SWR_MIC7"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC0"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC1"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC2"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC3"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC4"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC5"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC6"); + snd_soc_dapm_ignore_suspend(dapm, "TX SWR_DMIC7"); snd_soc_dapm_sync(dapm); for (i = 0; i < NUM_DECIMATORS; i++) {