Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / sound / soc / spear / spdif_out.c

diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index fe99f461aff0bfd97337f663ba2f13eecd626bbb..0a72d52d533ee6f8c657dde689231141cbe26505 100644 (file)
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -213,10 +213,7 @@ static int spdif_digital_mute(struct snd_soc_dai *dai, int mute)
 static int spdif_mute_get(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct snd_soc_card *card = codec->card;
-       struct snd_soc_pcm_runtime *rtd = card->rtd;
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);
        struct spdif_out_dev *host = snd_soc_dai_get_drvdata(cpu_dai);
 
        ucontrol->value.integer.value[0] = host->saved_params.mute;
@@ -226,10 +223,7 @@ static int spdif_mute_get(struct snd_kcontrol *kcontrol,
 static int spdif_mute_put(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct snd_soc_card *card = codec->card;
-       struct snd_soc_pcm_runtime *rtd = card->rtd;
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);
        struct spdif_out_dev *host = snd_soc_dai_get_drvdata(cpu_dai);
 
        if (host->saved_params.mute == ucontrol->value.integer.value[0])
@@ -360,7 +354,6 @@ static struct platform_driver spdif_out_driver = {
        .probe          = spdif_out_probe,
        .driver         = {
                .name   = "spdif-out",
-               .owner  = THIS_MODULE,
                .pm     = SPDIF_OUT_DEV_PM_OPS,
        },
 };