[PATCH 14/19] ASoC: codecs: es*: merge .digital_mute() into .mute_stream()

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: "Shengjiu Wang" <shengjiu.wang@nxp.com>,
	Linux-ALSA <alsa-devel@alsa-project.org>,
	"Michael Walle" <michael@walle.cc>,
	"\"Heiko Stübner\"" <heiko@sntech.de>,
	"Neil Armstrong" <narmstrong@baylibre.com>,
	"David Airlie" <airlied@linux.ie>,
	"\"Michał Mirosław\"" <mirq-linux@rere.qmqm.pl>,
	"Jonghwan Choi" <charlie.jh@kakaocorp.com>,
	"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
	"Paul Cercueil" <paul@crapouillou.net>,
	"Andrzej Hajda" <a.hajda@samsung.com>,
	"Frank Shi" <shifu0704@thundersoft.com>,
	"Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>,
	"Benjamin Gaignard" <benjamin.gaignard@linaro.org>,
	"Andrew F. Davis" <afd@ti.com>,
	"Fabio Estevam" <festevam@gmail.com>,
	"Jerome Brunet" <jbrunet@baylibre.com>,
	"Nikita Yushchenko" <nikita.yoush@cogentembedded.com>,
	"Pierre-Louis Bossart" <pierre-louis.bossart@linux.intel.com>,
	"Lars-Peter Clausen" <lars@metafoo.de>,
	"Joonyoung Shim" <jy0922.shim@samsung.com>,
	"Matthias Reichl" <hias@horus.com>,
	"Katsuhiro Suzuki" <katsuhiro@katsuster.net>,
	"Kevin Hilman" <khilman@baylibre.com>,
	"Kai Vehmanen" <kai.vehmanen@linux.intel.com>,
	"Takashi Iwai" <tiwai@suse.com>,
	YueHaibing <yuehaibing@huawei.com>,
	"Russell King" <linux@armlinux.org.uk>,
	"Krzysztof Kozlowski" <krzk@kernel.org>,
	"Daniel Drake" <drake@endlessm.com>,
	"Tzung-Bi Shih" <tzungbi@google.com>,
	"Ludovic Desroches" <ludovic.desroches@microchip.com>,
	"Kukjin Kim" <kgene@kernel.org>,
	"Ranjani Sridharan" <ranjani.sridharan@linux.intel.com>,
	"Dinghao Liu" <dinghao.liu@zju.edu.cn>,
	"Codrin Ciubotariu" <codrin.ciubotariu@microchip.com>,
	"Cheng-Yi Chiang" <cychiang@chromium.org>,
	"Chun-Kuang Hu" <chunkuang.hu@kernel.org>,
	"Bartosz Golaszewski" <bgolaszewski@baylibre.com>,
	"Charles Keepax" <ckeepax@opensource.cirrus.com>,
	"Philipp Zabel" <p.zabel@pengutronix.de>,
	"Jonas Karlman" <jonas@kwiboo.se>,
	"Liam Girdwood" <lgirdwood@gmail.com>,
	"Nicolas Ferre" <nicolas.ferre@microchip.com>,
	"Chuhong Yuan" <hslester96@gmail.com>,
	"Robin Murphy" <robin.murphy@arm.com>,
	"James Schulman" <james.schulman@cirrus.com>,
	"Inki Dae" <inki.dae@samsung.com>,
	"Masahiro Yamada" <masahiroy@kernel.org>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	"Dan Murphy" <dmurphy@ti.com>,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	"\"Nuno Sá\"" <nuno.sa@analog.com>,
	"Vincent Abriou" <vincent.abriou@st.com>,
	"Peter Ujfalusi" <peter.ujfalusi@ti.com>,
	"Jernej Skrabec" <jernej.skrabec@siol.net>,
	"Support Opensource" <support.opensource@diasemi.com>,
	"Marek Szyprowski" <m.szyprowski@samsung.com>,
	"Jason Yan" <yanaijie@huawei.com>,
	"Stephen Boyd" <sboyd@kernel.org>,
	"Pankaj Bharadiya" <pankaj.laxminarayan.bharadiya@intel.com>,
	"David Rhodes" <david.rhodes@cirrus.com>,
	"Seung-Woo Kim" <sw0312.kim@samsung.com>,
	"Sandy Huang" <hjc@rock-chips.com>, "Pavel Dobias" <dobias@2n.cz>,
	"Philipp Puschmann" <p.puschmann@pironex.de>,
	"Kyungmin Park" <kyungmin.park@samsung.com>,
	"Vishwas A Deshpande" <vishwas.a.deshpande@ti.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Colin Ian King" <colin.king@canonical.com>,
	"Kevin Cernekee" <cernekee@chromium.org>,
	"Lucas Stach" <l.stach@pengutronix.de>,
	"Shawn Guo" <shawnguo@kernel.org>,
	"Peter Rosin" <peda@axentia.se>,
	"M R Swami Reddy" <mr.swami.reddy@ti.com>
Subject: [PATCH 14/19] ASoC: codecs: es*: merge .digital_mute() into .mute_stream()
Date: 23 Jun 2020 10:20:48 +0900	[thread overview]
Message-ID: <87v9ji1ssu.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87ftam37ko.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>
---
 sound/soc/codecs/es8316.c | 7 +++++--
 sound/soc/codecs/es8328.c | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 36eef1fb3d18..6e0066fc9e26 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -507,8 +507,11 @@ 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)
 {
+	if (direction != SNDRV_PCM_STREAM_PLAYBACK)
+		return 0;
+
 	snd_soc_component_update_bits(dai->component, ES8316_DAC_SET1, 0x20,
 			    mute ? 0x20 : 0);
 	return 0;
@@ -522,7 +525,7 @@ 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,
 };
 
 static struct snd_soc_dai_driver es8316_dai = {
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index fdf64c29f563..b8ac7b31e2b9 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -449,8 +449,11 @@ 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)
 {
+	if (direction != SNDRV_PCM_STREAM_PLAYBACK)
+		return 0;
+
 	return snd_soc_component_update_bits(dai->component, ES8328_DACCONTROL3,
 			ES8328_DACCONTROL3_DACMUTE,
 			mute ? ES8328_DACCONTROL3_DACMUTE : 0);
@@ -692,7 +695,7 @@ 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,
 };
-- 
2.25.1

