Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4de59dbd authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: eureka-tlv320: Use static DAI format setup 



Set the dai_fmt field in the dai_link struct instead of manually calling
snd_soc_dai_fmt(). This makes the code cleaner and shorter.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b4508d0f

sound/soc/fsl/eukrea-tlv320.c

+2 −19
Original line number Original line Diff line number Diff line
@@ -42,25 +42,6 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret;

	int ret;





	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

				  SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM);

	/* fsl_ssi lacks the set_fmt ops. */

	if (ret && ret != -ENOTSUPP) {

		dev_err(cpu_dai->dev,

			"Failed to set the cpu dai format.\n");

		return ret;

	}



	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

				  SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM);

	if (ret) {

		dev_err(cpu_dai->dev,

			"Failed to set the codec format.\n");

		return ret;

	}



	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

				     CODEC_CLOCK, SND_SOC_CLOCK_OUT);

				     CODEC_CLOCK, SND_SOC_CLOCK_OUT);

	if (ret) {

	if (ret) {
@@ -91,6 +72,8 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { 
	.name		= "tlv320aic23",

	.name		= "tlv320aic23",

	.stream_name	= "TLV320AIC23",

	.stream_name	= "TLV320AIC23",

	.codec_dai_name	= "tlv320aic23-hifi",

	.codec_dai_name	= "tlv320aic23-hifi",

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBM_CFM,

	.ops		= &eukrea_tlv320_snd_ops,

	.ops		= &eukrea_tlv320_snd_ops,

};

};