Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
未验证 提交 3e60abeb 编写于 作者: C Charles Keepax 提交者： Mark Brown
浏览文件
操作

ASoC: cs35l41: Fixup the error messages 

It is not idiomatic for ASoC to print the function name in the error
messages, however it is expected to show the return code. Update the
error messages to follow these conventions.
Signed-off-by: NCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210914141349.30218-5-ckeepax@opensource.cirrus.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 e371eadf
隐藏空白更改
内联 并排
Showing with 24 addition and 29 deletion
sound/soc/codecs/cs35l41.c
浏览文件 @ 3e60abeb
...@@ -316,7 +316,7 @@ static int cs35l41_otp_unpack(void *data) ...@@ -316,7 +316,7 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_read(cs35l41->regmap, CS35L41_OTPID, &otp_id_reg); ret = regmap_read(cs35l41->regmap, CS35L41_OTPID, &otp_id_reg);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Read OTP ID failed\n"); dev_err(cs35l41->dev, "Read OTP ID failed: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
...@@ -335,7 +335,7 @@ static int cs35l41_otp_unpack(void *data) ...@@ -335,7 +335,7 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_bulk_read(cs35l41->regmap, CS35L41_OTP_MEM0, otp_mem, ret = regmap_bulk_read(cs35l41->regmap, CS35L41_OTP_MEM0, otp_mem,
CS35L41_OTP_SIZE_WORDS); CS35L41_OTP_SIZE_WORDS);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Read OTP Mem failed\n"); dev_err(cs35l41->dev, "Read OTP Mem failed: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
...@@ -349,12 +349,12 @@ static int cs35l41_otp_unpack(void *data) ...@@ -349,12 +349,12 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000055); ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000055);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write Unlock key failed 1/2\n"); dev_err(cs35l41->dev, "Write Unlock key failed 1/2: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000AA); ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000AA);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write Unlock key failed 2/2\n"); dev_err(cs35l41->dev, "Write Unlock key failed 2/2: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
...@@ -393,7 +393,7 @@ static int cs35l41_otp_unpack(void *data) ...@@ -393,7 +393,7 @@ static int cs35l41_otp_unpack(void *data)
otp_map[i].shift), otp_map[i].shift),
otp_val << otp_map[i].shift); otp_val << otp_map[i].shift);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write OTP val failed\n"); dev_err(cs35l41->dev, "Write OTP val failed: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
} }
...@@ -401,12 +401,12 @@ static int cs35l41_otp_unpack(void *data) ...@@ -401,12 +401,12 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000CC); ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000CC);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write Lock key failed 1/2\n"); dev_err(cs35l41->dev, "Write Lock key failed 1/2: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000033); ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000033);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write Lock key failed 2/2\n"); dev_err(cs35l41->dev, "Write Lock key failed 2/2: %d\n", ret);
goto err_otp_unpack; goto err_otp_unpack;
} }
ret = 0; ret = 0;
...@@ -745,9 +745,7 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -745,9 +745,7 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
case SND_SOC_DAIFMT_CBC_CFC: case SND_SOC_DAIFMT_CBC_CFC:
break; break;
default: default:
dev_warn(cs35l41->dev, dev_warn(cs35l41->dev, "Mixed provider/consumer mode unsupported\n");
"%s: Mixed provider/consumer mode unsupported\n",
__func__);
return -EINVAL; return -EINVAL;
} }
...@@ -758,8 +756,7 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -758,8 +756,7 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
daifmt |= 2 << CS35L41_ASP_FMT_SHIFT; daifmt |= 2 << CS35L41_ASP_FMT_SHIFT;
break; break;
default: default:
dev_warn(cs35l41->dev, dev_warn(cs35l41->dev, "Invalid or unsupported DAI format\n");
"%s: Invalid or unsupported DAI format\n", __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -776,8 +773,7 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -776,8 +773,7 @@ static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
case SND_SOC_DAIFMT_NB_NF: case SND_SOC_DAIFMT_NB_NF:
break; break;
default: default:
dev_warn(cs35l41->dev, dev_warn(cs35l41->dev, "Invalid DAI clock INV\n");
"%s: Invalid DAI clock INV\n", __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -824,8 +820,7 @@ static int cs35l41_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -824,8 +820,7 @@ static int cs35l41_pcm_hw_params(struct snd_pcm_substream *substream,
} }
if (i >= ARRAY_SIZE(cs35l41_fs_rates)) { if (i >= ARRAY_SIZE(cs35l41_fs_rates)) {
dev_err(cs35l41->dev, "%s: Unsupported rate: %u\n", dev_err(cs35l41->dev, "Unsupported rate: %u\n", rate);
__func__, rate);
return -EINVAL; return -EINVAL;
} }
...@@ -1048,7 +1043,7 @@ static int cs35l41_boost_config(struct cs35l41_private *cs35l41, ...@@ -1048,7 +1043,7 @@ static int cs35l41_boost_config(struct cs35l41_private *cs35l41,
CS35L41_BST_IPK_MASK, CS35L41_BST_IPK_MASK,
bst_ipk_scaled << CS35L41_BST_IPK_SHIFT); bst_ipk_scaled << CS35L41_BST_IPK_SHIFT);
if (ret) { if (ret) {
dev_err(dev, "Failed to write boost inductor peak current\n"); dev_err(dev, "Failed to write boost inductor peak current: %d\n", ret);
return ret; return ret;
} }
...@@ -1067,7 +1062,7 @@ static int cs35l41_set_pdata(struct cs35l41_private *cs35l41) ...@@ -1067,7 +1062,7 @@ static int cs35l41_set_pdata(struct cs35l41_private *cs35l41)
cs35l41->pdata.bst_cap, cs35l41->pdata.bst_cap,
cs35l41->pdata.bst_ipk); cs35l41->pdata.bst_ipk);
if (ret) { if (ret) {
dev_err(cs35l41->dev, "Error in Boost DT config\n"); dev_err(cs35l41->dev, "Error in Boost DT config: %d\n", ret);
return ret; return ret;
} }
} else { } else {
...@@ -1337,13 +1332,13 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1337,13 +1332,13 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, &regid); ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, &regid);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Get Device ID failed\n"); dev_err(cs35l41->dev, "Get Device ID failed: %d\n", ret);
goto err; goto err;
} }
ret = regmap_read(cs35l41->regmap, CS35L41_REVID, &reg_revid); ret = regmap_read(cs35l41->regmap, CS35L41_REVID, &reg_revid);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Get Revision ID failed\n"); dev_err(cs35l41->dev, "Get Revision ID failed: %d\n", ret);
goto err; goto err;
} }
...@@ -1367,7 +1362,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1367,7 +1362,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ARRAY_SIZE(cs35l41_reva0_errata_patch)); ARRAY_SIZE(cs35l41_reva0_errata_patch));
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, dev_err(cs35l41->dev,
"Failed to apply A0 errata patch %d\n", ret); "Failed to apply A0 errata patch: %d\n", ret);
goto err; goto err;
} }
break; break;
...@@ -1377,7 +1372,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1377,7 +1372,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ARRAY_SIZE(cs35l41_revb0_errata_patch)); ARRAY_SIZE(cs35l41_revb0_errata_patch));
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, dev_err(cs35l41->dev,
"Failed to apply B0 errata patch %d\n", ret); "Failed to apply B0 errata patch: %d\n", ret);
goto err; goto err;
} }
break; break;
...@@ -1387,7 +1382,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1387,7 +1382,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ARRAY_SIZE(cs35l41_revb2_errata_patch)); ARRAY_SIZE(cs35l41_revb2_errata_patch));
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, dev_err(cs35l41->dev,
"Failed to apply B2 errata patch %d\n", ret); "Failed to apply B2 errata patch: %d\n", ret);
goto err; goto err;
} }
break; break;
...@@ -1411,33 +1406,33 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1411,33 +1406,33 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ret = cs35l41_otp_unpack(cs35l41); ret = cs35l41_otp_unpack(cs35l41);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "OTP Unpack failed\n"); dev_err(cs35l41->dev, "OTP Unpack failed: %d\n", ret);
goto err; goto err;
} }
ret = regmap_write(cs35l41->regmap, CS35L41_DSP1_CCM_CORE_CTRL, 0); ret = regmap_write(cs35l41->regmap, CS35L41_DSP1_CCM_CORE_CTRL, 0);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write CCM_CORE_CTRL failed\n"); dev_err(cs35l41->dev, "Write CCM_CORE_CTRL failed: %d\n", ret);
goto err; goto err;
} }
ret = regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2, ret = regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
CS35L41_AMP_EN_MASK, 0); CS35L41_AMP_EN_MASK, 0);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write CS35L41_PWR_CTRL2 failed\n"); dev_err(cs35l41->dev, "Write CS35L41_PWR_CTRL2 failed: %d\n", ret);
goto err; goto err;
} }
ret = regmap_update_bits(cs35l41->regmap, CS35L41_AMP_GAIN_CTRL, ret = regmap_update_bits(cs35l41->regmap, CS35L41_AMP_GAIN_CTRL,
CS35L41_AMP_GAIN_PCM_MASK, 0); CS35L41_AMP_GAIN_PCM_MASK, 0);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "Write CS35L41_AMP_GAIN_CTRL failed\n"); dev_err(cs35l41->dev, "Write CS35L41_AMP_GAIN_CTRL failed: %d\n", ret);
goto err; goto err;
} }
ret = cs35l41_set_pdata(cs35l41); ret = cs35l41_set_pdata(cs35l41);
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "%s: Set pdata failed\n", __func__); dev_err(cs35l41->dev, "Set pdata failed: %d\n", ret);
goto err; goto err;
} }
...@@ -1445,7 +1440,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1445,7 +1440,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
&soc_component_dev_cs35l41, &soc_component_dev_cs35l41,
cs35l41_dai, ARRAY_SIZE(cs35l41_dai)); cs35l41_dai, ARRAY_SIZE(cs35l41_dai));
if (ret < 0) { if (ret < 0) {
dev_err(cs35l41->dev, "%s: Register codec failed\n", __func__); dev_err(cs35l41->dev, "Register codec failed: %d\n", ret);
goto err; goto err;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或