Dne sreda, 02. avgust 2023 ob 02:54:53 CEST je Kuninori Morimoto napisal(a):
> ALSA SoC merges DAI call backs into .ops.
> This patch merge thesse into one.
"these"
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
> ---
> sound/soc/sunxi/sun4i-codec.c | 6 +++++-
> sound/soc/sunxi/sun4i-i2s.c | 18 +++++++++---------
> sound/soc/sunxi/sun4i-spdif.c | 2 +-
> sound/soc/sunxi/sun50i-dmic.c | 2 +-
> 4 files changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
> index 55328850aef5..f0a5fd901101 100644
> --- a/sound/soc/sunxi/sun4i-codec.c
> +++ b/sound/soc/sunxi/sun4i-codec.c
> @@ -1252,9 +1252,12 @@ static int sun4i_codec_dai_probe(struct snd_soc_dai
> *dai) return 0;
> }
>
> +static const struct snd_soc_dai_ops dummy_dai_ops = {
> + .probe = sun4i_codec_dai_probe,
> +};
> +
> static struct snd_soc_dai_driver dummy_cpu_dai = {
> .name = "sun4i-codec-cpu-dai",
> - .probe = sun4i_codec_dai_probe,
> .playback = {
> .stream_name = "Playback",
> .channels_min = 1,
> @@ -1271,6 +1274,7 @@ static struct snd_soc_dai_driver dummy_cpu_dai = {
> .formats = SUN4I_CODEC_FORMATS,
> .sig_bits = 24,
> },
> + .ops = &dummy_dai_ops,
> };
>
> static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev,
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index 669d712bbe9f..5124b6c9ceb4 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
> @@ -1081,14 +1081,6 @@ static int sun4i_i2s_set_tdm_slot(struct snd_soc_dai
> *dai, return 0;
> }
>
> -static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
> - .hw_params = sun4i_i2s_hw_params,
> - .set_fmt = sun4i_i2s_set_fmt,
> - .set_sysclk = sun4i_i2s_set_sysclk,
> - .set_tdm_slot = sun4i_i2s_set_tdm_slot,
> - .trigger = sun4i_i2s_trigger,
> -};
> -
> static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
> {
> struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
> @@ -1100,12 +1092,20 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai
> *dai) return 0;
> }
>
> +static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
> + .probe = sun4i_i2s_dai_probe,
spaces should be used instead of a tab.
> + .hw_params = sun4i_i2s_hw_params,
> + .set_fmt = sun4i_i2s_set_fmt,
> + .set_sysclk = sun4i_i2s_set_sysclk,
> + .set_tdm_slot = sun4i_i2s_set_tdm_slot,
> + .trigger = sun4i_i2s_trigger,
> +};
> +
> #define SUN4I_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
> SNDRV_PCM_FMTBIT_S20_LE | \
> SNDRV_PCM_FMTBIT_S24_LE)
>
> static struct snd_soc_dai_driver sun4i_i2s_dai = {
> - .probe = sun4i_i2s_dai_probe,
> .capture = {
> .stream_name = "Capture",
> .channels_min = 1,
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index ff18d4113aac..28bf6f4dca46 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -508,6 +508,7 @@ static int sun4i_spdif_soc_dai_probe(struct snd_soc_dai
> *dai) }
>
> static const struct snd_soc_dai_ops sun4i_spdif_dai_ops = {
> + .probe = sun4i_spdif_soc_dai_probe,
Ditto.
Other than that:
Reviewed-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
Best regards,
Jernej
> .startup = sun4i_spdif_startup,
> .trigger = sun4i_spdif_trigger,
> .hw_params = sun4i_spdif_hw_params,
> @@ -533,7 +534,6 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = {
> .rates = SUN4I_RATES,
> .formats = SUN4I_FORMATS,
> },
> - .probe = sun4i_spdif_soc_dai_probe,
> .ops = &sun4i_spdif_dai_ops,
> .name = "spdif",
> };
> diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c
> index c10439b9e0a2..2599683a582d 100644
> --- a/sound/soc/sunxi/sun50i-dmic.c
> +++ b/sound/soc/sunxi/sun50i-dmic.c
> @@ -236,6 +236,7 @@ static int sun50i_dmic_soc_dai_probe(struct snd_soc_dai
> *dai) }
>
> static const struct snd_soc_dai_ops sun50i_dmic_dai_ops = {
> + .probe = sun50i_dmic_soc_dai_probe,
> .startup = sun50i_dmic_startup,
> .trigger = sun50i_dmic_trigger,
> .hw_params = sun50i_dmic_hw_params,
> @@ -260,7 +261,6 @@ static struct snd_soc_dai_driver sun50i_dmic_dai = {
> .formats = SUN50I_DMIC_FORMATS,
> .sig_bits = 21,
> },
> - .probe = sun50i_dmic_soc_dai_probe,
> .ops = &sun50i_dmic_dai_ops,
> .name = "dmic",
> };
