mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
ASoC: ti: 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: Kuninori Morimoto <[email protected]>
Reviewed-by: Peter Ujfalusi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
This commit is contained in:
1 parent
d789710fb2
commit
059374fe9e
1 file changed
+5
-4
@@ -420,7 +420,7 @@ static struct snd_soc_ops ams_delta_ops;
|
||||
* Shares hardware with codec config pulse generation */
|
||||
static bool ams_delta_muted = 1;
|
||||
|
||||
static int ams_delta_digital_mute(struct snd_soc_dai *dai, int mute)
|
||||
static int ams_delta_mute(struct snd_soc_dai *dai, int mute, int direction)
|
||||
{
|
||||
int apply;
|
||||
|
||||
@@ -439,18 +439,19 @@ static int ams_delta_digital_mute(struct snd_soc_dai *dai, int mute)
|
||||
|
||||
/* Our codec DAI probably doesn't have its own .ops structure */
|
||||
static const struct snd_soc_dai_ops ams_delta_dai_ops = {
|
||||
.digital_mute = ams_delta_digital_mute,
|
||||
.mute_stream = ams_delta_mute,
|
||||
.no_capture_mute = 1,
|
||||
};
|
||||
|
||||
/* Will be used if the codec ever has its own digital_mute function */
|
||||
static int ams_delta_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
return ams_delta_digital_mute(NULL, 0);
|
||||
return ams_delta_digital_mute(NULL, 0, substream->stream);
|
||||
}
|
||||
|
||||
static void ams_delta_shutdown(struct snd_pcm_substream *substream)
|
||||
{
|
||||
ams_delta_digital_mute(NULL, 1);
|
||||
ams_delta_digital_mute(NULL, 1, substream->stream);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user