From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Lucas Tanure <tanureal@opensource.cirrus.com>
Subject: [PATCH v3 12/16] ALSA: hda: cs35l41: Reorganize log for playback actions
Date: Tue, 8 Mar 2022 17:17:26 +0000 [thread overview]
Message-ID: <20220308171730.454587-13-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20220308171730.454587-1-tanureal@opensource.cirrus.com>
For each case, only log the last regmap access, so it doesn't get
overwritten, and as all regmap access should show the same issues
logging the last one should be enough.
Change to dev_err to log this error.
Also, differentiate between a regmap access failure and invalid
playback action.
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
sound/pci/hda/cs35l41_hda.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 08ce9b8005ec..fda4af323c32 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -144,10 +144,9 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
switch (action) {
case HDA_GEN_PCM_ACT_OPEN:
- ret = regmap_multi_reg_write(reg, cs35l41_hda_config,
- ARRAY_SIZE(cs35l41_hda_config));
- regmap_update_bits(reg, CS35L41_PWR_CTRL2,
- CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
+ regmap_multi_reg_write(reg, cs35l41_hda_config, ARRAY_SIZE(cs35l41_hda_config));
+ ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2,
+ CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
break;
case HDA_GEN_PCM_ACT_PREPARE:
ret = cs35l41_hda_global_enable(cs35l41, 1);
@@ -157,16 +156,16 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
ret = cs35l41_hda_global_enable(cs35l41, 0);
break;
case HDA_GEN_PCM_ACT_CLOSE:
- regmap_update_bits(reg, CS35L41_PWR_CTRL2,
- CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
+ ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2,
+ CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
break;
default:
- ret = -EINVAL;
+ dev_warn(cs35l41->dev, "Playback action not supported: %d\n", action);
break;
}
if (ret)
- dev_warn(cs35l41->dev, "Failed to apply multi reg write: %d\n", ret);
+ dev_err(cs35l41->dev, "Regmap access fail: %d\n", ret);
}
static int cs35l41_hda_channel_map(struct device *dev, unsigned int tx_num, unsigned int *tx_slot,
--
2.35.1
next prev parent reply other threads:[~2022-03-08 17:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 17:17 [PATCH v3 00/16] Support external boost at CS35l41 ASoC driver Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 01/16] sound: cs35l41: Unify hardware configuration Lucas Tanure
2022-03-10 13:44 ` Takashi Iwai
2022-03-10 16:40 ` tanureal
2022-03-10 16:43 ` Takashi Iwai
2022-03-08 17:17 ` [PATCH v3 02/16] sound: cs35l41: Check hw_config before using it Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 03/16] sound: cs35l41: Move cs35l41_gpio_config to shared lib Lucas Tanure
2022-03-10 13:40 ` Takashi Iwai
2022-03-08 17:17 ` [PATCH v3 04/16] ALSA: hda: cs35l41: Fix I2S params comments Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 05/16] ALSA: hda: cs35l41: Always configure the DAI Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 06/16] ALSA: hda: cs35l41: Add Boost type flag Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 07/16] hda: cs35l41: Put the device into safe mode for external boost Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 08/16] hda: cs35l41: Mute the device before shutdown Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 09/16] sound: cs35l41: Enable Internal Boost in shared lib Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 10/16] ALSA: hda: cs35l41: Move boost config to initialization code Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 11/16] ALSA: hda: cs35l41: Remove cs35l41_hda_reg_sequence struct Lucas Tanure
2022-03-08 17:17 ` Lucas Tanure [this message]
2022-03-08 17:17 ` [PATCH v3 13/16] ALSA: hda: cs35l41: Handle all external boost setups the same way Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 14/16] ALSA: hda: cs35l41: Move external boost handling to lib for ASoC use Lucas Tanure
2022-03-08 17:17 ` [PATCH v3 15/16] ASoC: dt-bindings: cs35l41: Document CS35l41 External Boost Lucas Tanure
2022-03-08 21:24 ` Rob Herring
2022-03-09 1:20 ` Rob Herring
2022-03-09 9:28 ` Lucas tanure
2022-03-09 9:37 ` Charles Keepax
2022-03-08 17:17 ` [PATCH v3 16/16] ASoC: cs35l41: Support external boost Lucas Tanure
2022-03-09 9:36 ` Charles Keepax
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=20220308171730.454587-13-tanureal@opensource.cirrus.com \
--to=tanureal@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=tiwai@suse.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®