ASoC: Use dai_fmt in Speyside (26e67811) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/samsung/speyside.c

+4 −29

Original line number	Diff line number	Diff line
		@@ -92,33 +92,6 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
		return 0;
		}

		static int speyside_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		int 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 < 0)
		return ret;

		ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
		\| SND_SOC_DAIFMT_NB_NF
		\| SND_SOC_DAIFMT_CBM_CFM);
		if (ret < 0)
		return ret;

		return 0;
		}

		static struct snd_soc_ops speyside_ops = {
		.hw_params = speyside_hw_params,
		};

		static struct snd_soc_jack speyside_headset;

		/* Headset jack detection DAPM pins */
		@@ -208,7 +181,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
		.platform_name = "samsung-audio",
		.codec_name = "wm8996.1-001a",
		.init = speyside_wm8996_init,
		.ops = &speyside_ops,
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF
		\| SND_SOC_DAIFMT_CBM_CFM,
		},
		{
		.name = "Baseband",
		@@ -216,7 +190,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
		.cpu_dai_name = "wm8996-aif2",
		.codec_dai_name = "wm1250-ev1",
		.codec_name = "wm1250-ev1.1-0027",
		.ops = &speyside_ops,
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF
		\| SND_SOC_DAIFMT_CBM_CFM,
		.ignore_suspend = 1,
		},
		};