Merge "asoc: Ratelimit error logs"

This commit is contained in:
qctecmdr 2019-05-18 03:03:10 -07:00 committed by Gerrit - the friendly Code Review server
commit 4a0cf5086c
5 changed files with 10 additions and 8 deletions

View File

@ -70,7 +70,7 @@ static int audio_ext_clk_prepare(struct clk_hw *hw)
clk_priv->clk_cfg.enable = 1;
ret = afe_set_lpass_clk_cfg(IDX_RSVD_3, &clk_priv->clk_cfg);
if (ret < 0) {
pr_err("%s afe_set_digital_codec_core_clock failed\n",
pr_err_ratelimited("%s afe_set_digital_codec_core_clock failed\n",
__func__);
return ret;
}
@ -112,7 +112,7 @@ static void audio_ext_clk_unprepare(struct clk_hw *hw)
clk_priv->clk_cfg.enable = 0;
ret = afe_set_lpass_clk_cfg(IDX_RSVD_3, &clk_priv->clk_cfg);
if (ret < 0)
pr_err("%s: afe_set_lpass_clk_cfg failed, ret = %d\n",
pr_err_ratelimited("%s: afe_set_lpass_clk_cfg failed, ret = %d\n",
__func__, ret);
}

View File

@ -212,7 +212,7 @@ static int tx_macro_mclk_enable(struct tx_macro_priv *tx_priv,
TX_CORE_CLK,
true);
if (ret < 0) {
dev_err(tx_priv->dev,
dev_err_ratelimited(tx_priv->dev,
"%s: request clock enable failed\n",
__func__);
goto exit;

View File

@ -815,7 +815,7 @@ static int wsa_macro_mclk_enable(struct wsa_macro_priv *wsa_priv,
wsa_priv->default_clk_id,
true);
if (ret < 0) {
dev_err(wsa_priv->dev,
dev_err_ratelimited(wsa_priv->dev,
"%s: wsa request clock enable failed\n",
__func__);
goto exit;
@ -2637,7 +2637,7 @@ static int wsa_swrm_clock(void *handle, bool enable)
if (ret < 0) {
msm_cdc_pinctrl_select_sleep_state(
wsa_priv->wsa_swr_gpio_p);
dev_err(wsa_priv->dev,
dev_err_ratelimited(wsa_priv->dev,
"%s: wsa request clock enable failed\n",
__func__);
goto exit;

View File

@ -7578,7 +7578,7 @@ int afe_set_lpass_clk_cfg(int index, struct afe_clk_set *cfg)
ret = afe_q6_interface_prepare();
if (ret != 0) {
pr_err("%s: Q6 interface prepare failed %d\n", __func__, ret);
pr_err_ratelimited("%s: Q6 interface prepare failed %d\n", __func__, ret);
return ret;
}
@ -7599,7 +7599,7 @@ int afe_set_lpass_clk_cfg(int index, struct afe_clk_set *cfg)
ret = q6afe_svc_pack_and_set_param_in_band(index, param_hdr,
(u8 *) cfg);
if (ret < 0)
pr_err("%s: AFE clk cfg failed with ret %d\n",
pr_err_ratelimited("%s: AFE clk cfg failed with ret %d\n",
__func__, ret);
mutex_unlock(&this_afe.afe_cmd_lock);

View File

@ -249,7 +249,7 @@ static int swrm_clk_request(struct swr_mstr_ctrl *swrm, bool enable)
if (swrm->clk_ref_count == 1) {
ret = swrm->clk(swrm->handle, true);
if (ret) {
dev_err(swrm->dev,
dev_err_ratelimited(swrm->dev,
"%s: clock enable req failed",
__func__);
--swrm->clk_ref_count;
@ -1277,6 +1277,8 @@ static irqreturn_t swr_mstr_interrupt(int irq, void *dev)
mutex_lock(&swrm->reslock);
if (swrm_clk_request(swrm, true)) {
dev_err_ratelimited(swrm->dev, "%s:clk request failed\n",
__func__);
mutex_unlock(&swrm->reslock);
goto exit;
}