alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
	alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>,
	Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>,
	Sangbeom Kim <sbkim73@samsung.com>,
	Denis Carikli <denis@eukrea.com>,
	Manuel Lauss <manuel.lauss@googlemail.com>,
	Bo Shen <voice.shen@atmel.com>, Shawn Guo <shawn.guo@linaro.org>,
	Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
	Daniel Mack <daniel@zonque.org>
Subject: [PATCH 15/21] ASoC: s3c24xx_simtec: Use static DAI format setup
Date: Thu,  1 Jan 2015 17:16:24 +0100	[thread overview]
Message-ID: <1420128990-6872-16-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1420128990-6872-1-git-send-email-lars@metafoo.de>

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: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/samsung/s3c24xx_simtec.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/sound/soc/samsung/s3c24xx_simtec.c b/sound/soc/samsung/s3c24xx_simtec.c
index 2c015f6..dcc008d 100644
--- a/sound/soc/samsung/s3c24xx_simtec.c
+++ b/sound/soc/samsung/s3c24xx_simtec.c
@@ -169,24 +169,6 @@ static int simtec_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 	int ret;
 
-	/* Set the CODEC as the bus clock master, I2S */
-	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-				  SND_SOC_DAIFMT_NB_NF |
-				  SND_SOC_DAIFMT_CBM_CFM);
-	if (ret) {
-		pr_err("%s: failed set cpu dai format\n", __func__);
-		return ret;
-	}
-
-	/* Set the CODEC as the bus clock master */
-	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-				  SND_SOC_DAIFMT_NB_NF |
-				  SND_SOC_DAIFMT_CBM_CFM);
-	if (ret) {
-		pr_err("%s: failed set codec dai format\n", __func__);
-		return ret;
-	}
-
 	ret = snd_soc_dai_set_sysclk(codec_dai, 0,
 				     CODEC_CLOCK, SND_SOC_CLOCK_IN);
 	if (ret) {
@@ -320,6 +302,8 @@ int simtec_audio_core_probe(struct platform_device *pdev,
 	int ret;
 
 	card->dai_link->ops = &simtec_snd_ops;
+	card->dai_link->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+				  SND_SOC_DAIFMT_CBM_CFM;
 
 	pdata = pdev->dev.platform_data;
 	if (!pdata) {
-- 
1.8.0

  parent reply	other threads:[~2015-01-01 16:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-01 16:16 [PATCH 00/21] ASoC: Use static DAI format setup Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 01/21] ASoC: sam9g20_wm8731: " Lars-Peter Clausen
2015-01-04  1:11   ` Bo Shen
2015-01-01 16:16 ` [PATCH 02/21] ASoC: db1200: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 03/21] ASoC: eureka-tlv320: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 04/21] ASoC: mx27vis-aci32x4: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 05/21] ASoC: wm1133-ev1: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 06/21] ASoC: mxs-sgtl5000: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 07/21] ASoC: ams-delta: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 08/21] ASoC: raumfeld: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 09/21] ASoC: zylonite: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 10/21] ASoC: goni_wm8994: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 11/21] ASoC: h1940_uda1380: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 12/21] ASoC: jive_wm8750: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 13/21] ASoC: neo1973_wm8753: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 14/21] ASoC: rx1950_uda1380: " Lars-Peter Clausen
2015-01-01 16:16 ` Lars-Peter Clausen [this message]
2015-01-01 16:16 ` [PATCH 16/21] ASoC: s3c24xx_uda134x: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 17/21] ASoC: smartq_wm8987: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 18/21] ASoC: smdk_wm8580: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 19/21] ASoC: smdk_wm8570pcm: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 20/21] ASoC: smdk_wm8994pcm: " Lars-Peter Clausen
2015-01-01 16:16 ` [PATCH 21/21] ASoC: migor: " Lars-Peter Clausen
2015-01-06 17:34 ` [PATCH 00/21] ASoC: " Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420128990-6872-16-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=daniel@zonque.org \
    --cc=denis@eukrea.com \
    --cc=fabio.estevam@freescale.com \
    --cc=g.liakhovetski@gmx.de \
    --cc=jkrzyszt@tis.icnet.pl \
    --cc=lgirdwood@gmail.com \
    --cc=manuel.lauss@googlemail.com \
    --cc=sbkim73@samsung.com \
    --cc=shawn.guo@linaro.org \
    --cc=voice.shen@atmel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).