Merge remote-tracking branches 'asoc/topic/cx20442' and 'asoc/topic/davinci' into...

[cascardo/linux.git] / sound / soc / davinci / davinci-evm.c

diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index b6bb594..731fb0d 100644 (file)
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -117,7 +117,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
-       struct snd_soc_codec *codec = rtd->codec;
        struct device_node *np = card->dev->of_node;
        int ret;
 
@@ -136,9 +135,9 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
        }
 
        /* not connected */
-       snd_soc_dapm_nc_pin(&codec->dapm, "MONO_LOUT");
-       snd_soc_dapm_nc_pin(&codec->dapm, "HPLCOM");
-       snd_soc_dapm_nc_pin(&codec->dapm, "HPRCOM");
+       snd_soc_dapm_nc_pin(&card->dapm, "MONO_LOUT");
+       snd_soc_dapm_nc_pin(&card->dapm, "HPLCOM");
+       snd_soc_dapm_nc_pin(&card->dapm, "HPRCOM");
 
        return 0;
 }
@@ -425,18 +424,8 @@ static int davinci_evm_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int davinci_evm_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       snd_soc_unregister_card(card);
-
-       return 0;
-}
-
 static struct platform_driver davinci_evm_driver = {
        .probe          = davinci_evm_probe,
-       .remove         = davinci_evm_remove,
        .driver         = {
                .name   = "davinci_evm",
                .pm     = &snd_soc_pm_ops,