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

Commit 3aa273e3 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: ams-delta: 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 bc6a5d64

sound/soc/omap/ams-delta.c

+3 −15
Original line number Diff line number Diff line
@@ -412,21 +412,7 @@ static struct tty_ldisc_ops cx81801_ops = { 
 * over the modem port.

 */



static int ams_delta_hw_params(struct snd_pcm_substream *substream,

			 struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;



	/* Set cpu DAI configuration */

	return snd_soc_dai_set_fmt(rtd->cpu_dai,

				   SND_SOC_DAIFMT_DSP_A |

				   SND_SOC_DAIFMT_NB_NF |

				   SND_SOC_DAIFMT_CBM_CFM);

}



static struct snd_soc_ops ams_delta_ops = {

	.hw_params = ams_delta_hw_params,

};

static struct snd_soc_ops ams_delta_ops;





/* Digital mute implemented using modem/CPU multiplexer.
@@ -546,6 +532,8 @@ static struct snd_soc_dai_link ams_delta_dai_link = { 
	.platform_name = "omap-mcbsp.1",

	.codec_name = "cx20442-codec",

	.ops = &ams_delta_ops,

	.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

};



/* Audio card driver */