mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-08 15:04:45 +00:00
ASoC: bcm: merge DAI call back functions into ops
ALSA SoC merges DAI call backs into .ops. This patch merge these into one. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87leelb0uk.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
598d2dce58
commit
755ecb0062
@ -737,17 +737,6 @@ static void bcm2835_i2s_shutdown(struct snd_pcm_substream *substream,
|
||||
bcm2835_i2s_stop_clock(dev);
|
||||
}
|
||||
|
||||
static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
|
||||
.startup = bcm2835_i2s_startup,
|
||||
.shutdown = bcm2835_i2s_shutdown,
|
||||
.prepare = bcm2835_i2s_prepare,
|
||||
.trigger = bcm2835_i2s_trigger,
|
||||
.hw_params = bcm2835_i2s_hw_params,
|
||||
.set_fmt = bcm2835_i2s_set_dai_fmt,
|
||||
.set_bclk_ratio = bcm2835_i2s_set_dai_bclk_ratio,
|
||||
.set_tdm_slot = bcm2835_i2s_set_dai_tdm_slot,
|
||||
};
|
||||
|
||||
static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai)
|
||||
{
|
||||
struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
|
||||
@ -759,9 +748,20 @@ static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
|
||||
.probe = bcm2835_i2s_dai_probe,
|
||||
.startup = bcm2835_i2s_startup,
|
||||
.shutdown = bcm2835_i2s_shutdown,
|
||||
.prepare = bcm2835_i2s_prepare,
|
||||
.trigger = bcm2835_i2s_trigger,
|
||||
.hw_params = bcm2835_i2s_hw_params,
|
||||
.set_fmt = bcm2835_i2s_set_dai_fmt,
|
||||
.set_bclk_ratio = bcm2835_i2s_set_dai_bclk_ratio,
|
||||
.set_tdm_slot = bcm2835_i2s_set_dai_tdm_slot,
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_driver bcm2835_i2s_dai = {
|
||||
.name = "bcm2835-i2s",
|
||||
.probe = bcm2835_i2s_dai_probe,
|
||||
.playback = {
|
||||
.channels_min = 2,
|
||||
.channels_max = 2,
|
||||
|
Loading…
Reference in New Issue
Block a user