]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: cygnus: Remove set_fmt from SPDIF dai ops
authorLori Hikichi <lori.hikichi@broadcom.com>
Thu, 28 Sep 2017 22:29:34 +0000 (15:29 -0700)
committerMark Brown <broonie@kernel.org>
Wed, 4 Oct 2017 10:59:24 +0000 (11:59 +0100)
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>
sound/soc/bcm/cygnus-ssp.c

index e9c73a451cf65a0d8d4ce986c985475ca7bc823c..da14facb8a6f8db150c54e64bbc826f6bd59a1f6 100644 (file)
@@ -1137,6 +1137,13 @@ static const struct snd_soc_dai_ops cygnus_ssp_dai_ops = {
        .set_tdm_slot   = cygnus_set_dai_tdm_slot,
 };
 
+static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
+       .startup        = cygnus_ssp_startup,
+       .shutdown       = cygnus_ssp_shutdown,
+       .trigger        = cygnus_ssp_trigger,
+       .hw_params      = cygnus_ssp_hw_params,
+       .set_sysclk     = cygnus_ssp_set_sysclk,
+};
 
 #define INIT_CPU_DAI(num) { \
        .name = "cygnus-ssp" #num, \
@@ -1175,7 +1182,7 @@ static const struct snd_soc_dai_driver cygnus_spdif_dai_info = {
                .formats = SNDRV_PCM_FMTBIT_S16_LE |
                        SNDRV_PCM_FMTBIT_S32_LE,
        },
-       .ops = &cygnus_ssp_dai_ops,
+       .ops = &cygnus_spdif_dai_ops,
        .suspend = cygnus_ssp_suspend,
        .resume = cygnus_ssp_resume,
 };