Commit 1eb2c43d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: codecs: pcm*: merge .digital_mute() into .mute_stream()

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/87zh89wix5.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent bd63ed76
...@@ -147,7 +147,7 @@ static int pcm1681_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -147,7 +147,7 @@ static int pcm1681_set_dai_fmt(struct snd_soc_dai *codec_dai,
return 0; return 0;
} }
static int pcm1681_digital_mute(struct snd_soc_dai *dai, int mute) static int pcm1681_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm1681_private *priv = snd_soc_component_get_drvdata(component); struct pcm1681_private *priv = snd_soc_component_get_drvdata(component);
...@@ -205,7 +205,8 @@ static int pcm1681_hw_params(struct snd_pcm_substream *substream, ...@@ -205,7 +205,8 @@ static int pcm1681_hw_params(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops pcm1681_dai_ops = { static const struct snd_soc_dai_ops pcm1681_dai_ops = {
.set_fmt = pcm1681_set_dai_fmt, .set_fmt = pcm1681_set_dai_fmt,
.hw_params = pcm1681_hw_params, .hw_params = pcm1681_hw_params,
.digital_mute = pcm1681_digital_mute, .mute_stream = pcm1681_mute,
.no_capture_mute = 1,
}; };
static const struct snd_soc_dapm_widget pcm1681_dapm_widgets[] = { static const struct snd_soc_dapm_widget pcm1681_dapm_widgets[] = {
......
...@@ -60,7 +60,7 @@ static int pcm1789_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -60,7 +60,7 @@ static int pcm1789_set_dai_fmt(struct snd_soc_dai *codec_dai,
return 0; return 0;
} }
static int pcm1789_digital_mute(struct snd_soc_dai *codec_dai, int mute) static int pcm1789_mute(struct snd_soc_dai *codec_dai, int mute, int direction)
{ {
struct snd_soc_component *component = codec_dai->component; struct snd_soc_component *component = codec_dai->component;
struct pcm1789_private *priv = snd_soc_component_get_drvdata(component); struct pcm1789_private *priv = snd_soc_component_get_drvdata(component);
...@@ -167,8 +167,9 @@ static int pcm1789_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -167,8 +167,9 @@ static int pcm1789_trigger(struct snd_pcm_substream *substream, int cmd,
static const struct snd_soc_dai_ops pcm1789_dai_ops = { static const struct snd_soc_dai_ops pcm1789_dai_ops = {
.set_fmt = pcm1789_set_dai_fmt, .set_fmt = pcm1789_set_dai_fmt,
.hw_params = pcm1789_hw_params, .hw_params = pcm1789_hw_params,
.digital_mute = pcm1789_digital_mute, .mute_stream = pcm1789_mute,
.trigger = pcm1789_trigger, .trigger = pcm1789_trigger,
.no_capture_mute = 1,
}; };
static const DECLARE_TLV_DB_SCALE(pcm1789_dac_tlv, -12000, 50, 1); static const DECLARE_TLV_DB_SCALE(pcm1789_dac_tlv, -12000, 50, 1);
......
...@@ -76,7 +76,7 @@ static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -76,7 +76,7 @@ static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai,
return 0; return 0;
} }
static int pcm179x_digital_mute(struct snd_soc_dai *dai, int mute) static int pcm179x_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm179x_private *priv = snd_soc_component_get_drvdata(component); struct pcm179x_private *priv = snd_soc_component_get_drvdata(component);
...@@ -145,7 +145,8 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, ...@@ -145,7 +145,8 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops pcm179x_dai_ops = { static const struct snd_soc_dai_ops pcm179x_dai_ops = {
.set_fmt = pcm179x_set_dai_fmt, .set_fmt = pcm179x_set_dai_fmt,
.hw_params = pcm179x_hw_params, .hw_params = pcm179x_hw_params,
.digital_mute = pcm179x_digital_mute, .mute_stream = pcm179x_mute,
.no_capture_mute = 1,
}; };
static const DECLARE_TLV_DB_SCALE(pcm179x_dac_tlv, -12000, 50, 1); static const DECLARE_TLV_DB_SCALE(pcm179x_dac_tlv, -12000, 50, 1);
......
...@@ -290,7 +290,7 @@ static int pcm3168a_reset(struct pcm3168a_priv *pcm3168a) ...@@ -290,7 +290,7 @@ static int pcm3168a_reset(struct pcm3168a_priv *pcm3168a)
PCM3168A_MRST_MASK | PCM3168A_SRST_MASK); PCM3168A_MRST_MASK | PCM3168A_SRST_MASK);
} }
static int pcm3168a_digital_mute(struct snd_soc_dai *dai, int mute) static int pcm3168a_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component); struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(component);
...@@ -570,8 +570,9 @@ static const struct snd_soc_dai_ops pcm3168a_dai_ops = { ...@@ -570,8 +570,9 @@ static const struct snd_soc_dai_ops pcm3168a_dai_ops = {
.set_fmt = pcm3168a_set_dai_fmt, .set_fmt = pcm3168a_set_dai_fmt,
.set_sysclk = pcm3168a_set_dai_sysclk, .set_sysclk = pcm3168a_set_dai_sysclk,
.hw_params = pcm3168a_hw_params, .hw_params = pcm3168a_hw_params,
.digital_mute = pcm3168a_digital_mute, .mute_stream = pcm3168a_mute,
.set_tdm_slot = pcm3168a_set_tdm_slot, .set_tdm_slot = pcm3168a_set_tdm_slot,
.no_capture_mute = 1,
}; };
static struct snd_soc_dai_driver pcm3168a_dais[] = { static struct snd_soc_dai_driver pcm3168a_dais[] = {
......
...@@ -1394,7 +1394,7 @@ static int pcm512x_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) ...@@ -1394,7 +1394,7 @@ static int pcm512x_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
return 0; return 0;
} }
static int pcm512x_digital_mute(struct snd_soc_dai *dai, int mute) static int pcm512x_mute(struct snd_soc_dai *dai, int mute, int direction)
{ {
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component); struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
...@@ -1445,8 +1445,9 @@ static const struct snd_soc_dai_ops pcm512x_dai_ops = { ...@@ -1445,8 +1445,9 @@ static const struct snd_soc_dai_ops pcm512x_dai_ops = {
.startup = pcm512x_dai_startup, .startup = pcm512x_dai_startup,
.hw_params = pcm512x_hw_params, .hw_params = pcm512x_hw_params,
.set_fmt = pcm512x_set_fmt, .set_fmt = pcm512x_set_fmt,
.digital_mute = pcm512x_digital_mute, .mute_stream = pcm512x_mute,
.set_bclk_ratio = pcm512x_set_bclk_ratio, .set_bclk_ratio = pcm512x_set_bclk_ratio,
.no_capture_mute = 1,
}; };
static struct snd_soc_dai_driver pcm512x_dai = { static struct snd_soc_dai_driver pcm512x_dai = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment