diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 17:16:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 18:34:28 +0100 |
| commit | 3aa273e3f65455066aa7338845e11910ba2bae12 (patch) | |
| tree | 1063111b88cf5b48c60246d2ff0df2baa078d666 /sound/soc/omap | |
| parent | ASoC: mxs-sgtl5000: Use static DAI format setup (diff) | |
| download | linux-3aa273e3f65455066aa7338845e11910ba2bae12.tar.xz linux-3aa273e3f65455066aa7338845e11910ba2bae12.zip | |
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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 4c6afb75eea6..706613077c15 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -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 */ |