diff options
author | Lori Hikichi <lori.hikichi@broadcom.com> | 2017-09-28 18:29:34 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-10-04 06:59:24 -0400 |
commit | fcf30f3b4377d2475aa709ce28964461990c3caa (patch) | |
tree | 623cf554ed517cfc7433eb42c3ba04c32d671779 | |
parent | d8302aa6b53acbe421fe615b9d704fd813623e96 (diff) |
ASoC: cygnus: Remove set_fmt from SPDIF dai ops
The SPDIF port cannot modify its format so a set_fmt function is not
needed. Previously, we used a generic set_fmt for all ports and returned
an error code for the SPDIF port. It is cleaner to not populate the
set_fmt field.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/bcm/cygnus-ssp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c index e9c73a451cf6..da14facb8a6f 100644 --- a/sound/soc/bcm/cygnus-ssp.c +++ b/sound/soc/bcm/cygnus-ssp.c | |||
@@ -1137,6 +1137,13 @@ static const struct snd_soc_dai_ops cygnus_ssp_dai_ops = { | |||
1137 | .set_tdm_slot = cygnus_set_dai_tdm_slot, | 1137 | .set_tdm_slot = cygnus_set_dai_tdm_slot, |
1138 | }; | 1138 | }; |
1139 | 1139 | ||
1140 | static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = { | ||
1141 | .startup = cygnus_ssp_startup, | ||
1142 | .shutdown = cygnus_ssp_shutdown, | ||
1143 | .trigger = cygnus_ssp_trigger, | ||
1144 | .hw_params = cygnus_ssp_hw_params, | ||
1145 | .set_sysclk = cygnus_ssp_set_sysclk, | ||
1146 | }; | ||
1140 | 1147 | ||
1141 | #define INIT_CPU_DAI(num) { \ | 1148 | #define INIT_CPU_DAI(num) { \ |
1142 | .name = "cygnus-ssp" #num, \ | 1149 | .name = "cygnus-ssp" #num, \ |
@@ -1175,7 +1182,7 @@ static const struct snd_soc_dai_driver cygnus_spdif_dai_info = { | |||
1175 | .formats = SNDRV_PCM_FMTBIT_S16_LE | | 1182 | .formats = SNDRV_PCM_FMTBIT_S16_LE | |
1176 | SNDRV_PCM_FMTBIT_S32_LE, | 1183 | SNDRV_PCM_FMTBIT_S32_LE, |
1177 | }, | 1184 | }, |
1178 | .ops = &cygnus_ssp_dai_ops, | 1185 | .ops = &cygnus_spdif_dai_ops, |
1179 | .suspend = cygnus_ssp_suspend, | 1186 | .suspend = cygnus_ssp_suspend, |
1180 | .resume = cygnus_ssp_resume, | 1187 | .resume = cygnus_ssp_resume, |
1181 | }; | 1188 | }; |