From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH v3 16/21] ASoC: codecs: es*: merge .digital_mute() into .mute_stream()
Date: 09 Jul 2020 10:56:57 +0900 [thread overview]
Message-ID: <87tuyhwiwm.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87h7uhxxk6.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
snd_soc_dai_digital_mute() is internally using both
mute_stream() (1) or digital_mute() (2), but the difference between
these 2 are only handling direction.
We can merge digital_mute() into mute_stream
int snd_soc_dai_digital_mute(xxx, int direction)
{
...
else if (dai->driver->ops->mute_stream)
(1) return dai->driver->ops->mute_stream(xxx, direction);
else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
dai->driver->ops->digital_mute)
(2) return dai->driver->ops->digital_mute(xxx);
...
}
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/codecs/es8316.c | 5 +++--
sound/soc/codecs/es8328.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 36eef1fb3d18..c474812182be 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -507,7 +507,7 @@ static int es8316_pcm_hw_params(struct snd_pcm_substream *substream,
return 0;
}
-static int es8316_mute(struct snd_soc_dai *dai, int mute)
+static int es8316_mute(struct snd_soc_dai *dai, int mute, int direction)
{
snd_soc_component_update_bits(dai->component, ES8316_DAC_SET1, 0x20,
mute ? 0x20 : 0);
@@ -522,7 +522,8 @@ static const struct snd_soc_dai_ops es8316_ops = {
.hw_params = es8316_pcm_hw_params,
.set_fmt = es8316_set_dai_fmt,
.set_sysclk = es8316_set_dai_sysclk,
- .digital_mute = es8316_mute,
+ .mute_stream = es8316_mute,
+ .no_capture_mute = 1,
};
static struct snd_soc_dai_driver es8316_dai = {
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index fdf64c29f563..1acb3dc412bc 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -449,7 +449,7 @@ static const struct snd_soc_dapm_route es8328_dapm_routes[] = {
{ "ROUT2", NULL, "Right Out 2" },
};
-static int es8328_mute(struct snd_soc_dai *dai, int mute)
+static int es8328_mute(struct snd_soc_dai *dai, int mute, int direction)
{
return snd_soc_component_update_bits(dai->component, ES8328_DACCONTROL3,
ES8328_DACCONTROL3_DACMUTE,
@@ -692,9 +692,10 @@ static int es8328_set_bias_level(struct snd_soc_component *component,
static const struct snd_soc_dai_ops es8328_dai_ops = {
.startup = es8328_startup,
.hw_params = es8328_hw_params,
- .digital_mute = es8328_mute,
+ .mute_stream = es8328_mute,
.set_sysclk = es8328_set_sysclk,
.set_fmt = es8328_set_dai_fmt,
+ .no_capture_mute = 1,
};
static struct snd_soc_dai_driver es8328_dai = {
--
2.25.1
next prev parent reply other threads:[~2020-07-09 2:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 1:55 [PATCH v3 00/21] ASoC: merge .digital_mute() into .mute_stream() Kuninori Morimoto
2020-07-09 1:55 ` [PATCH v3 01/21] ASoC: hdmi-codec: return -ENOTSUPP for digital_mute Kuninori Morimoto
2020-07-09 1:55 ` [PATCH v3 02/21] ASoC: soc-dai.c: add .no_capture_mute support Kuninori Morimoto
2020-07-09 1:55 ` [PATCH v3 03/21] ASoC: hdmi-codec: merge .digital_mute() into .mute_stream() Kuninori Morimoto
2020-07-09 1:55 ` [PATCH v3 04/21] ASoC: ti: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 05/21] ASoC: spear: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 06/21] ASoC: meson: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 07/21] ASoC: atmel: " Kuninori Morimoto
2020-07-16 20:44 ` Mark Brown
2020-07-16 23:27 ` Kuninori Morimoto
2020-07-16 23:59 ` Mark Brown
2020-07-09 1:56 ` [PATCH v3 08/21] ASoC: codecs: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 09/21] ASoC: codecs: tlv*: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 10/21] ASoC: codecs: tas*: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 11/21] ASoC: codecs: ssm*: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 12/21] ASoC: codecs: pcm*: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 13/21] ASoC: codecs: max*: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 14/21] ASoC: codecs: alc*: " Kuninori Morimoto
2020-07-09 1:56 ` [PATCH v3 15/21] ASoC: codecs: wm*: " Kuninori Morimoto
2020-07-09 1:56 ` Kuninori Morimoto [this message]
2020-07-09 1:57 ` [PATCH v3 17/21] ASoC: codecs: da*: " Kuninori Morimoto
2020-07-09 1:57 ` [PATCH v3 18/21] ASoC: codecs: cs*: " Kuninori Morimoto
2020-07-09 1:57 ` [PATCH v3 19/21] ASoC: codecs: ak*: " Kuninori Morimoto
2020-07-09 1:57 ` [PATCH v3 20/21] ASoC: soc-dai: remove .digital_mute Kuninori Morimoto
2020-07-09 1:57 ` [PATCH v3 21/21] ASoC: soc-core: snd_soc_dai_digital_mute() for both CPU/Codec Kuninori Morimoto
2020-07-16 23:56 ` [PATCH v3 00/21] ASoC: merge .digital_mute() into .mute_stream() 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=87tuyhwiwm.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/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.