Merge "ASoC: msm8x16: reduce logging level to avoid flooding for success case." (99c100f9) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/msm8x16-wcd.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -1083,14 +1083,15 @@ static int msm8x16_wcd_spmi_write_device(u16 reg, u8 *value, u32 bytes)
		ret = spmi_ext_register_writel(wcd->spmi->ctrl, wcd->spmi->sid,
		wcd->base + reg, value, bytes);
		if (ret)
		pr_err("Unable to write to addr=%x, ret(%d)\n", reg, ret);
		pr_err_ratelimited("Unable to write to addr=%x, ret(%d)\n",
		reg, ret);
		/* Try again if the write fails */
		if (ret != 0) {
		usleep_range(10, 11);
		ret = spmi_ext_register_writel(wcd->spmi->ctrl, wcd->spmi->sid,
		wcd->base + reg, value, 1);
		if (ret != 0) {
		pr_err("failed to write the device\n");
		pr_err_ratelimited("failed to write the device\n");
		return ret;
		}
		}
		@@ -1183,7 +1184,7 @@ err:
		mutex_unlock(&msm8x16_wcd->io_lock);

		if (ret < 0) {
		dev_err(msm8x16_wcd->dev,
		dev_err_ratelimited(msm8x16_wcd->dev,
		"%s: codec read failed for reg 0x%x\n",
		__func__, reg);
		return ret;
		@@ -1270,7 +1271,7 @@ static int msm8x16_wcd_write(struct snd_soc_codec *codec, unsigned int reg,
		if (!msm8x16_wcd_volatile(codec, reg)) {
		ret = snd_soc_cache_write(codec, reg, value);
		if (ret != 0)
		dev_err(codec->dev, "Cache write to %x failed: %d\n",
		dev_err_ratelimited(codec->dev, "Cache write to %x failed: %d\n",
		reg, ret);
		}
		if (unlikely(test_bit(BUS_DOWN, &msm8x16_wcd->status_mask))) {
		@@ -1299,7 +1300,7 @@ static unsigned int msm8x16_wcd_read(struct snd_soc_codec *codec,
		ret = snd_soc_cache_read(codec, reg, &val);
		if (ret >= 0)
		return val;
		dev_err(codec->dev, "Cache read from %x failed: %d\n",
		dev_err_ratelimited(codec->dev, "Cache read from %x failed: %d\n",
		reg, ret);
		}
		if (unlikely(test_bit(BUS_DOWN, &msm8x16_wcd->status_mask))) {

sound/soc/codecs/wsa881x-analog.c

+15 −11

Original line number	Diff line number	Diff line
		@@ -176,22 +176,24 @@ static int wsa881x_i2c_write_device(struct wsa881x_pdata *wsa881x,

		wsa881x_index = get_i2c_wsa881x_device_index(reg);
		if (wsa881x_index < 0) {
		pr_err("%s:invalid register to write\n", __func__);
		pr_err_ratelimited("%s:invalid register to write\n", __func__);
		return -EINVAL;
		}
		if (wsa881x->regmap_flag) {
		rc = regmap_write(wsa881x->regmap[wsa881x_index], reg, val);
		for (i = 0; rc && i < ARRAY_SIZE(delay_array_msec); i++) {
		pr_err("Failed writing reg=%u - retry(%d)\n", reg, i);
		pr_err_ratelimited("Failed writing reg=%u-retry(%d)\n",
		reg, i);
		/* retry after delay of increasing order */
		msleep(delay_array_msec[i]);
		rc = regmap_write(wsa881x->regmap[wsa881x_index],
		reg, val);
		}
		if (rc)
		pr_err("Failed writing reg=%u rc=%d\n", reg, rc);
		pr_err_ratelimited("Failed writing reg=%u rc=%d\n",
		reg, rc);
		else
		pr_err("write success register = %x val = %x\n",
		pr_debug("write success register = %x val = %x\n",
		reg, val);
		} else {
		reg_addr = (u8)reg;
		@@ -210,7 +212,7 @@ static int wsa881x_i2c_write_device(struct wsa881x_pdata *wsa881x,
		wsa881x->client[wsa881x_index]->adapter,
		wsa881x->xfer_msg, 1);
		if (ret != 1) {
		pr_err("failed to write the device\n");
		pr_err_ratelimited("failed to write the device\n");
		return ret;
		}
		}
		@@ -232,20 +234,22 @@ static int wsa881x_i2c_read_device(struct wsa881x_pdata *wsa881x,

		wsa881x_index = get_i2c_wsa881x_device_index(reg);
		if (wsa881x_index < 0) {
		pr_err("%s:invalid register to read\n", __func__);
		pr_err_ratelimited("%s:invalid register to read\n", __func__);
		return -EINVAL;
		}
		if (wsa881x->regmap_flag) {
		rc = regmap_read(wsa881x->regmap[wsa881x_index], reg, &val);
		for (i = 0; rc && i < ARRAY_SIZE(delay_array_msec); i++) {
		pr_err("Failed reading reg=%u - retry(%d)\n", reg, i);
		pr_err_ratelimited("Failed reading reg=%u - retry(%d)\n",
		reg, i);
		/* retry after delay of increasing order */
		msleep(delay_array_msec[i]);
		rc = regmap_read(wsa881x->regmap[wsa881x_index],
		reg, &val);
		}
		if (rc) {
		pr_err("Failed reading reg=%u rc=%d\n", reg, rc);
		pr_err_ratelimited("Failed reading reg=%u rc=%d\n",
		reg, rc);
		return rc;
		}
		pr_debug("read success reg = %x val = %x\n",
		@@ -272,7 +276,7 @@ static int wsa881x_i2c_read_device(struct wsa881x_pdata *wsa881x,
		wsa881x->client[wsa881x_index]->adapter,
		wsa881x->xfer_msg, 2);
		if (ret != 2) {
		pr_err("failed to read wsa register:%d\n",
		pr_err_ratelimited("failed to read wsa register:%d\n",
		reg);
		return ret;
		}
		@@ -290,7 +294,7 @@ static unsigned int wsa881x_i2c_read(struct snd_soc_codec *codec,
		int ret;

		if (codec == NULL) {
		pr_err("%s: invalid codec\n", __func__);
		pr_err_ratelimited("%s: invalid codec\n", __func__);
		return -EINVAL;
		}
		wsa881x = snd_soc_codec_get_drvdata(codec);
		@@ -313,7 +317,7 @@ static int wsa881x_i2c_write(struct snd_soc_codec *codec, unsigned int reg,
		int ret = 0;

		if (codec == NULL) {
		pr_err("%s: invalid codec\n", __func__);
		pr_err_ratelimited("%s: invalid codec\n", __func__);
		return -EINVAL;
		}
		wsa881x = snd_soc_codec_get_drvdata(codec);