Unverified Commit 54b59270 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: codecs: 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/875zaxxxi4.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f795ff78

sound/soc/codecs/88pm860x-codec.c

+5 −3
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static const struct snd_soc_dapm_route pm860x_dapm_routes[] = { 
 * Use MUTE_LEFT & MUTE_RIGHT to implement digital mute.

 * These bits can also be used to mute.

 */

static int pm860x_digital_mute(struct snd_soc_dai *codec_dai, int mute)

static int pm860x_mute_stream(struct snd_soc_dai *codec_dai, int mute, int direction)

{

	struct snd_soc_component *component = codec_dai->component;

	int data = 0, mask = MUTE_LEFT | MUTE_RIGHT;
@@ -1136,17 +1136,19 @@ static int pm860x_set_bias_level(struct snd_soc_component *component, 
}



static const struct snd_soc_dai_ops pm860x_pcm_dai_ops = {

	.digital_mute	= pm860x_digital_mute,

	.mute_stream	= pm860x_mute_stream,

	.hw_params	= pm860x_pcm_hw_params,

	.set_fmt	= pm860x_pcm_set_dai_fmt,

	.set_sysclk	= pm860x_set_dai_sysclk,

	.no_capture_mute = 1,

};



static const struct snd_soc_dai_ops pm860x_i2s_dai_ops = {

	.digital_mute	= pm860x_digital_mute,

	.mute_stream	= pm860x_mute_stream,

	.hw_params	= pm860x_i2s_hw_params,

	.set_fmt	= pm860x_i2s_set_dai_fmt,

	.set_sysclk	= pm860x_set_dai_sysclk,

	.no_capture_mute = 1,

};



#define PM860X_RATES	(SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |	\

sound/soc/codecs/ad193x.c

+3 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static inline bool ad193x_has_adc(const struct ad193x_priv *ad193x) 
 * DAI ops entries

 */



static int ad193x_mute(struct snd_soc_dai *dai, int mute)

static int ad193x_mute(struct snd_soc_dai *dai, int mute, int direction)

{

	struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(dai->component);
@@ -371,10 +371,11 @@ static int ad193x_startup(struct snd_pcm_substream *substream, 
static const struct snd_soc_dai_ops ad193x_dai_ops = {

	.startup = ad193x_startup,

	.hw_params = ad193x_hw_params,

	.digital_mute = ad193x_mute,

	.mute_stream = ad193x_mute,

	.set_tdm_slot = ad193x_set_tdm_slot,

	.set_sysclk	= ad193x_set_dai_sysclk,

	.set_fmt = ad193x_set_dai_fmt,

	.no_capture_mute = 1,

};



/* codec DAI instance */

sound/soc/codecs/adau1701.c

+3 −2
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static int adau1701_set_bias_level(struct snd_soc_component *component, 
	return 0;

}



static int adau1701_digital_mute(struct snd_soc_dai *dai, int mute)

static int adau1701_mute_stream(struct snd_soc_dai *dai, int mute, int direction)

{

	struct snd_soc_component *component = dai->component;

	unsigned int mask = ADAU1701_DSPCTRL_DAM;
@@ -631,8 +631,9 @@ static int adau1701_startup(struct snd_pcm_substream *substream, 
static const struct snd_soc_dai_ops adau1701_dai_ops = {

	.set_fmt	= adau1701_set_dai_fmt,

	.hw_params	= adau1701_hw_params,

	.digital_mute	= adau1701_digital_mute,

	.mute_stream	= adau1701_mute_stream,

	.startup	= adau1701_startup,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver adau1701_dai = {

sound/soc/codecs/cpcap.c

+7 −4
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ static int cpcap_hifi_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	return regmap_update_bits(cpcap->regmap, reg, mask, val);

}



static int cpcap_hifi_set_mute(struct snd_soc_dai *dai, int mute)

static int cpcap_hifi_set_mute(struct snd_soc_dai *dai, int mute, int direction)

{

	struct snd_soc_component *component = dai->component;

	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
@@ -1237,7 +1237,8 @@ static const struct snd_soc_dai_ops cpcap_dai_hifi_ops = { 
	.hw_params	= cpcap_hifi_hw_params,

	.set_sysclk	= cpcap_hifi_set_dai_sysclk,

	.set_fmt	= cpcap_hifi_set_dai_fmt,

	.digital_mute	= cpcap_hifi_set_mute,

	.mute_stream	= cpcap_hifi_set_mute,

	.no_capture_mute = 1,

};



static int cpcap_voice_hw_params(struct snd_pcm_substream *substream,
@@ -1370,7 +1371,8 @@ static int cpcap_voice_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	return 0;

}



static int cpcap_voice_set_mute(struct snd_soc_dai *dai, int mute)

static int cpcap_voice_set_mute(struct snd_soc_dai *dai,

				int mute, int direction)

{

	struct snd_soc_component *component = dai->component;

	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
@@ -1391,7 +1393,8 @@ static const struct snd_soc_dai_ops cpcap_dai_voice_ops = { 
	.hw_params	= cpcap_voice_hw_params,

	.set_sysclk	= cpcap_voice_set_dai_sysclk,

	.set_fmt	= cpcap_voice_set_dai_fmt,

	.digital_mute	= cpcap_voice_set_mute,

	.mute_stream	= cpcap_voice_set_mute,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cpcap_dai[] = {

sound/soc/codecs/cq93vc.c

+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static const struct snd_kcontrol_new cq93vc_snd_controls[] = { 
	SOC_SINGLE("Mono DAC Playback Volume", DAVINCI_VC_REG09, 0, 0x3f, 0),

};



static int cq93vc_mute(struct snd_soc_dai *dai, int mute)

static int cq93vc_mute(struct snd_soc_dai *dai, int mute, int direction)

{

	struct snd_soc_component *component = dai->component;

	u8 reg;
@@ -87,8 +87,9 @@ static int cq93vc_set_bias_level(struct snd_soc_component *component, 
#define CQ93VC_FORMATS	(SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE)



static const struct snd_soc_dai_ops cq93vc_dai_ops = {

	.digital_mute	= cq93vc_mute,

	.mute_stream	= cq93vc_mute,

	.set_sysclk	= cq93vc_set_dai_sysclk,

	.no_capture_mute = 1,

};



static struct snd_soc_dai_driver cq93vc_dai = {