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

Commit 10756c27 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: smartq_wm8987: 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 517b9a2a

sound/soc/samsung/smartq_wm8987.c

+2 −14
Original line number Diff line number Diff line
@@ -56,20 +56,6 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream, 
		break;

	}



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

					     SND_SOC_DAIFMT_NB_NF |

					     SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

					   SND_SOC_DAIFMT_NB_NF |

					   SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* Use PCLK for I2S signal generation */

	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,

					0, SND_SOC_CLOCK_IN);
@@ -199,6 +185,8 @@ static struct snd_soc_dai_link smartq_dai[] = { 
		.platform_name	= "samsung-i2s.0",

		.codec_name	= "wm8750.0-0x1a",

		.init		= smartq_wm8987_init,

		.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBS_CFS,

		.ops		= &smartq_hifi_ops,

	},

};