From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>
Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org,
james.schulman@cirrus.com, lgirdwood@gmail.com,
david.rhodes@cirrus.com
Subject: [PATCH 5/6] ASoC: cs35l41: Fixup the error messages
Date: Tue, 14 Sep 2021 15:13:48 +0100 [thread overview]
Message-ID: <20210914141349.30218-5-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20210914141349.30218-1-ckeepax@opensource.cirrus.com>
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: Charles Keepax <ckeepax@opensource.cirrus.com>
---
sound/soc/codecs/cs35l41.c | 53 +++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 29 deletions(-)
diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index 0d7073bb313ab..cc158fe4b7fe7 100644
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -316,7 +316,7 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_read(cs35l41->regmap, CS35L41_OTPID, &otp_id_reg);
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;
}
@@ -335,7 +335,7 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_bulk_read(cs35l41->regmap, CS35L41_OTP_MEM0, otp_mem,
CS35L41_OTP_SIZE_WORDS);
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;
}
@@ -349,12 +349,12 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000055);
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;
}
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000AA);
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;
}
@@ -393,7 +393,7 @@ static int cs35l41_otp_unpack(void *data)
otp_map[i].shift),
otp_val << otp_map[i].shift);
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;
}
}
@@ -401,12 +401,12 @@ static int cs35l41_otp_unpack(void *data)
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000CC);
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;
}
ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000033);
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;
}
ret = 0;
@@ -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:
break;
default:
- dev_warn(cs35l41->dev,
- "%s: Mixed provider/consumer mode unsupported\n",
- __func__);
+ dev_warn(cs35l41->dev, "Mixed provider/consumer mode unsupported\n");
return -EINVAL;
}
@@ -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;
break;
default:
- dev_warn(cs35l41->dev,
- "%s: Invalid or unsupported DAI format\n", __func__);
+ dev_warn(cs35l41->dev, "Invalid or unsupported DAI format\n");
return -EINVAL;
}
@@ -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:
break;
default:
- dev_warn(cs35l41->dev,
- "%s: Invalid DAI clock INV\n", __func__);
+ dev_warn(cs35l41->dev, "Invalid DAI clock INV\n");
return -EINVAL;
}
@@ -824,8 +820,7 @@ static int cs35l41_pcm_hw_params(struct snd_pcm_substream *substream,
}
if (i >= ARRAY_SIZE(cs35l41_fs_rates)) {
- dev_err(cs35l41->dev, "%s: Unsupported rate: %u\n",
- __func__, rate);
+ dev_err(cs35l41->dev, "Unsupported rate: %u\n", rate);
return -EINVAL;
}
@@ -1048,7 +1043,7 @@ static int cs35l41_boost_config(struct cs35l41_private *cs35l41,
CS35L41_BST_IPK_MASK,
bst_ipk_scaled << CS35L41_BST_IPK_SHIFT);
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;
}
@@ -1067,7 +1062,7 @@ static int cs35l41_set_pdata(struct cs35l41_private *cs35l41)
cs35l41->pdata.bst_cap,
cs35l41->pdata.bst_ipk);
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;
}
} else {
@@ -1337,13 +1332,13 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, ®id);
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;
}
ret = regmap_read(cs35l41->regmap, CS35L41_REVID, ®_revid);
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;
}
@@ -1367,7 +1362,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ARRAY_SIZE(cs35l41_reva0_errata_patch));
if (ret < 0) {
dev_err(cs35l41->dev,
- "Failed to apply A0 errata patch %d\n", ret);
+ "Failed to apply A0 errata patch: %d\n", ret);
goto err;
}
break;
@@ -1377,7 +1372,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ARRAY_SIZE(cs35l41_revb0_errata_patch));
if (ret < 0) {
dev_err(cs35l41->dev,
- "Failed to apply B0 errata patch %d\n", ret);
+ "Failed to apply B0 errata patch: %d\n", ret);
goto err;
}
break;
@@ -1387,7 +1382,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ARRAY_SIZE(cs35l41_revb2_errata_patch));
if (ret < 0) {
dev_err(cs35l41->dev,
- "Failed to apply B2 errata patch %d\n", ret);
+ "Failed to apply B2 errata patch: %d\n", ret);
goto err;
}
break;
@@ -1411,33 +1406,33 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
ret = cs35l41_otp_unpack(cs35l41);
if (ret < 0) {
- dev_err(cs35l41->dev, "OTP Unpack failed\n");
+ dev_err(cs35l41->dev, "OTP Unpack failed: %d\n", ret);
goto err;
}
ret = regmap_write(cs35l41->regmap, CS35L41_DSP1_CCM_CORE_CTRL, 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;
}
ret = regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
CS35L41_AMP_EN_MASK, 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;
}
ret = regmap_update_bits(cs35l41->regmap, CS35L41_AMP_GAIN_CTRL,
CS35L41_AMP_GAIN_PCM_MASK, 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;
}
ret = cs35l41_set_pdata(cs35l41);
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;
}
@@ -1445,7 +1440,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
&soc_component_dev_cs35l41,
cs35l41_dai, ARRAY_SIZE(cs35l41_dai));
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;
}
--
2.11.0
next prev parent reply other threads:[~2021-09-14 14:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 14:13 [PATCH 1/6] ASoC: cs35l41: Fix use of an uninitialised variable Charles Keepax
2021-09-14 14:13 ` [PATCH 2/6] ASoC: cs35l41: Use regmap_read_poll_timeout to wait for OTP boot Charles Keepax
2021-09-14 14:13 ` [PATCH 3/6] ASoC: cs35l41: Combine adjacent register writes Charles Keepax
2021-09-14 14:13 ` [PATCH 4/6] ASoC: cs35l41: Don't overwrite returned error code Charles Keepax
2021-09-14 14:13 ` Charles Keepax [this message]
2021-09-14 14:13 ` [PATCH 6/6] ASoC: cs35l41: Fix a bunch of trivial code formating/style issues Charles Keepax
2021-09-14 14:23 ` Mark Brown
2021-09-15 10:53 ` Charles Keepax
2021-09-15 11:38 ` Mark Brown
2021-09-15 15:21 ` [PATCH 1/6] ASoC: cs35l41: Fix use of an uninitialised variable Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210914141349.30218-5-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=david.rhodes@cirrus.com \
--cc=james.schulman@cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.