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

diff --combined sound/soc/davinci/davinci-evm.c
index 8c2b9be80a9a24608c20b24d7fad8005b43c7e1e,b6bb5947a8a8435f5219d4d8efb541e842e531f4,1f314a836f2a9ec51fc678e57be26f9e00b13e79..731fb0d86c6ab305a499baaa306112353b02782e
--- 1/sound/soc/davinci/davinci-evm.c
--- 2/sound/soc/davinci/davinci-evm.c
--- 3/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@@@ -117,7 -117,7 -117,6 +117,6 @@@@ static const struct snd_soc_dapm_route 
   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 -136,9 -135,9 +135,9 @@@@
        }
   
        /* 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,8 -425,18 -424,18 +424,8 @@@@ static int davinci_evm_probe(struct pla
        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,