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

ASoC: fsl: merge DAI call back functions into ops 



ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87jzu5b0ue.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/fsl/fsl_asrc.c

+8 −8
Original line number Diff line number Diff line
@@ -780,13 +780,6 @@ static int fsl_asrc_dai_trigger(struct snd_pcm_substream *substream, int cmd, 
	return 0;

}



static const struct snd_soc_dai_ops fsl_asrc_dai_ops = {

	.startup      = fsl_asrc_dai_startup,

	.hw_params    = fsl_asrc_dai_hw_params,

	.hw_free      = fsl_asrc_dai_hw_free,

	.trigger      = fsl_asrc_dai_trigger,

};



static int fsl_asrc_dai_probe(struct snd_soc_dai *dai)

{

	struct fsl_asrc *asrc = snd_soc_dai_get_drvdata(dai);
@@ -797,12 +790,19 @@ static int fsl_asrc_dai_probe(struct snd_soc_dai *dai) 
	return 0;

}



static const struct snd_soc_dai_ops fsl_asrc_dai_ops = {

	.probe		= fsl_asrc_dai_probe,

	.startup	= fsl_asrc_dai_startup,

	.hw_params	= fsl_asrc_dai_hw_params,

	.hw_free	= fsl_asrc_dai_hw_free,

	.trigger	= fsl_asrc_dai_trigger,

};



#define FSL_ASRC_FORMATS	(SNDRV_PCM_FMTBIT_S24_LE | \

				 SNDRV_PCM_FMTBIT_S16_LE | \

				 SNDRV_PCM_FMTBIT_S24_3LE)



static struct snd_soc_dai_driver fsl_asrc_dai = {

	.probe = fsl_asrc_dai_probe,

	.playback = {

		.stream_name = "ASRC-Playback",

		.channels_min = 1,

sound/soc/fsl/fsl_aud2htx.c

+5 −5
Original line number Diff line number Diff line
@@ -49,10 +49,6 @@ static int fsl_aud2htx_trigger(struct snd_pcm_substream *substream, int cmd, 
	return 0;

}



static const struct snd_soc_dai_ops fsl_aud2htx_dai_ops = {

	.trigger	= fsl_aud2htx_trigger,

};



static int fsl_aud2htx_dai_probe(struct snd_soc_dai *cpu_dai)

{

	struct fsl_aud2htx *aud2htx = dev_get_drvdata(cpu_dai->dev);
@@ -84,8 +80,12 @@ static int fsl_aud2htx_dai_probe(struct snd_soc_dai *cpu_dai) 
	return 0;

}



static struct snd_soc_dai_driver fsl_aud2htx_dai = {

static const struct snd_soc_dai_ops fsl_aud2htx_dai_ops = {

	.probe		= fsl_aud2htx_dai_probe,

	.trigger	= fsl_aud2htx_trigger,

};



static struct snd_soc_dai_driver fsl_aud2htx_dai = {

	.playback = {

		.stream_name = "CPU-Playback",

		.channels_min = 1,

sound/soc/fsl/fsl_easrc.c

+8 −8
Original line number Diff line number Diff line
@@ -1531,13 +1531,6 @@ static int fsl_easrc_hw_free(struct snd_pcm_substream *substream, 
	return 0;

}



static const struct snd_soc_dai_ops fsl_easrc_dai_ops = {

	.startup = fsl_easrc_startup,

	.trigger = fsl_easrc_trigger,

	.hw_params = fsl_easrc_hw_params,

	.hw_free = fsl_easrc_hw_free,

};



static int fsl_easrc_dai_probe(struct snd_soc_dai *cpu_dai)

{

	struct fsl_asrc *easrc = dev_get_drvdata(cpu_dai->dev);
@@ -1548,8 +1541,15 @@ static int fsl_easrc_dai_probe(struct snd_soc_dai *cpu_dai) 
	return 0;

}



static struct snd_soc_dai_driver fsl_easrc_dai = {

static const struct snd_soc_dai_ops fsl_easrc_dai_ops = {

	.probe		= fsl_easrc_dai_probe,

	.startup	= fsl_easrc_startup,

	.trigger	= fsl_easrc_trigger,

	.hw_params	= fsl_easrc_hw_params,

	.hw_free	= fsl_easrc_hw_free,

};



static struct snd_soc_dai_driver fsl_easrc_dai = {

	.playback = {

		.stream_name = "ASRC-Playback",

		.channels_min = 1,

sound/soc/fsl/fsl_esai.c

+10 −10
Original line number Diff line number Diff line
@@ -785,15 +785,6 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, 
	return 0;

}



static const struct snd_soc_dai_ops fsl_esai_dai_ops = {

	.startup = fsl_esai_startup,

	.trigger = fsl_esai_trigger,

	.hw_params = fsl_esai_hw_params,

	.set_sysclk = fsl_esai_set_dai_sysclk,

	.set_fmt = fsl_esai_set_dai_fmt,

	.set_tdm_slot = fsl_esai_set_dai_tdm_slot,

};



static int fsl_esai_dai_probe(struct snd_soc_dai *dai)

{

	struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
@@ -804,8 +795,17 @@ static int fsl_esai_dai_probe(struct snd_soc_dai *dai) 
	return 0;

}



static struct snd_soc_dai_driver fsl_esai_dai = {

static const struct snd_soc_dai_ops fsl_esai_dai_ops = {

	.probe		= fsl_esai_dai_probe,

	.startup	= fsl_esai_startup,

	.trigger	= fsl_esai_trigger,

	.hw_params	= fsl_esai_hw_params,

	.set_sysclk	= fsl_esai_set_dai_sysclk,

	.set_fmt	= fsl_esai_set_dai_fmt,

	.set_tdm_slot	= fsl_esai_set_dai_tdm_slot,

};



static struct snd_soc_dai_driver fsl_esai_dai = {

	.playback = {

		.stream_name = "CPU-Playback",

		.channels_min = 1,

sound/soc/fsl/fsl_micfil.c

+7 −7
Original line number Diff line number Diff line
@@ -764,12 +764,6 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static const struct snd_soc_dai_ops fsl_micfil_dai_ops = {

	.startup = fsl_micfil_startup,

	.trigger = fsl_micfil_trigger,

	.hw_params = fsl_micfil_hw_params,

};



static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai)

{

	struct fsl_micfil *micfil = dev_get_drvdata(cpu_dai->dev);
@@ -807,8 +801,14 @@ static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) 
	return 0;

}



static struct snd_soc_dai_driver fsl_micfil_dai = {

static const struct snd_soc_dai_ops fsl_micfil_dai_ops = {

	.probe		= fsl_micfil_dai_probe,

	.startup	= fsl_micfil_startup,

	.trigger	= fsl_micfil_trigger,

	.hw_params	= fsl_micfil_hw_params,

};



static struct snd_soc_dai_driver fsl_micfil_dai = {

	.capture = {

		.stream_name = "CPU-Capture",

		.channels_min = 1,