Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/mtk', 'asoc/topic...

diff --combined sound/soc/codecs/ab8500-codec.c
index 3056487ed5a9be834dcb5c3ee69774dca8208fdc,2fc89155f14a1a2de2eddc2ca60c2f5f5c1190fb,2fc89155f14a1a2de2eddc2ca60c2f5f5c1190fb,2fc89155f14a1a2de2eddc2ca60c2f5f5c1190fb,1d4059cfc7645737768c152452b8497fcfd7eb30..935ff7cb71c57ca9c458be5a032c0a9e8f190a28
--- 1/sound/soc/codecs/ab8500-codec.c
--- 2/sound/soc/codecs/ab8500-codec.c
--- 3/sound/soc/codecs/ab8500-codec.c
--- 4/sound/soc/codecs/ab8500-codec.c
--- 5/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@@@@@ -2408,28 -2408,28 -2408,28 -2408,28 -2408,28 +2408,28 @@@@@@ static void ab8500_codec_of_probe(struc
     {
        u32 value;
     
----    if (of_get_property(np, "stericsson,amic1-type-single-ended", NULL))
++++    if (of_property_read_bool(np, "stericsson,amic1-type-single-ended"))
                codec->amics.mic1_type = AMIC_TYPE_SINGLE_ENDED;
        else
                codec->amics.mic1_type = AMIC_TYPE_DIFFERENTIAL;
     
----    if (of_get_property(np, "stericsson,amic2-type-single-ended", NULL))
++++    if (of_property_read_bool(np, "stericsson,amic2-type-single-ended"))
                codec->amics.mic2_type = AMIC_TYPE_SINGLE_ENDED;
        else
                codec->amics.mic2_type = AMIC_TYPE_DIFFERENTIAL;
     
        /* Has a non-standard Vamic been requested? */
----    if (of_get_property(np, "stericsson,amic1a-bias-vamic2", NULL))
++++    if (of_property_read_bool(np, "stericsson,amic1a-bias-vamic2"))
                codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC2;
        else
                codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC1;
     
----    if (of_get_property(np, "stericsson,amic1b-bias-vamic2", NULL))
++++    if (of_property_read_bool(np, "stericsson,amic1b-bias-vamic2"))
                codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC2;
        else
                codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC1;
     
----    if (of_get_property(np, "stericsson,amic2-bias-vamic1", NULL))
++++    if (of_property_read_bool(np, "stericsson,amic2-bias-vamic1"))
                codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC1;
        else
                codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC2;
@@@@@@ -2525,14 -2525,12 -2525,12 -2525,12 -2525,12 +2525,14 @@@@@@ static int ab8500_codec_probe(struct sn
     
     static struct snd_soc_codec_driver ab8500_codec_driver = {
        .probe =                ab8500_codec_probe,
 ----   .controls =             ab8500_ctrls,
 ----   .num_controls =         ARRAY_SIZE(ab8500_ctrls),
 ----   .dapm_widgets =         ab8500_dapm_widgets,
 ----   .num_dapm_widgets =     ARRAY_SIZE(ab8500_dapm_widgets),
 ----   .dapm_routes =          ab8500_dapm_routes,
 ----   .num_dapm_routes =      ARRAY_SIZE(ab8500_dapm_routes),
 ++++   .component_driver = {
 ++++           .controls =             ab8500_ctrls,
 ++++           .num_controls =         ARRAY_SIZE(ab8500_ctrls),
 ++++           .dapm_widgets =         ab8500_dapm_widgets,
 ++++           .num_dapm_widgets =     ARRAY_SIZE(ab8500_dapm_widgets),
 ++++           .dapm_routes =          ab8500_dapm_routes,
 ++++           .num_dapm_routes =      ARRAY_SIZE(ab8500_dapm_routes),
 ++++   },
     };
     
     static int ab8500_codec_driver_probe(struct platform_device *pdev)

diff --combined sound/soc/codecs/max98371.c
index 02352ed8961c47ccb270ef9ff8f7aff3784bd4ca,30538790b1b78648da0899842cf4a5e0716c247f,cf0a39bb631aac9ae9bccd6c0b5163e65d8178b1,cf0a39bb631aac9ae9bccd6c0b5163e65d8178b1,cf0a39bb631aac9ae9bccd6c0b5163e65d8178b1..781be9ba8dba0f212e1939f4cb995e64024a3d49
--- 1/sound/soc/codecs/max98371.c
--- 2/sound/soc/codecs/max98371.c
--- 3/sound/soc/codecs/max98371.c
--- 4/sound/soc/codecs/max98371.c
--- 5/sound/soc/codecs/max98371.c
+++ b/sound/soc/codecs/max98371.c
@@@@@@ -412,7 -412,6 -412,6 -412,6 -412,6 +412,7 @@@@@@ static int max98371_i2c_remove(struct i
     
     static const struct i2c_device_id max98371_i2c_id[] = {
        { "max98371", 0 },
 ++++   { }
     };
     
     MODULE_DEVICE_TABLE(i2c, max98371_i2c_id);
@@@@@@ -426,7 -425,6 -425,7 -425,7 -425,7 +426,6 @@@@@@ MODULE_DEVICE_TABLE(of, max98371_of_mat
     static struct i2c_driver max98371_i2c_driver = {
        .driver = {
                .name = "max98371",
- ---           .owner = THIS_MODULE,
                .pm = NULL,
                .of_match_table = of_match_ptr(max98371_of_match),
        },

diff --combined sound/soc/soc-core.c
index 7440d16a2435536faf7170a094881e0b779c43e8,16369cad480388c326f2463273e17ebef0324924,16369cad480388c326f2463273e17ebef0324924,16369cad480388c326f2463273e17ebef0324924,ead49d032e4cb0a89811e9eaa2915536a0848a60..c0bbcd9032613a78aef551ce697cabc792880bad
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
--- 3/sound/soc/soc-core.c
--- 4/sound/soc/soc-core.c
--- 5/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@@@@ -1056,7 -1056,7 -1056,7 -1056,7 -1056,7 +1056,7 @@@@@@ static int soc_bind_dai_link(struct snd
        if (!rtd->platform) {
                dev_err(card->dev, "ASoC: platform %s not registered\n",
                        dai_link->platform_name);
 ----           return -EPROBE_DEFER;
 ++++           goto _err_defer;
        }
     
        soc_add_pcm_runtime(card, rtd);
@@@@@@ -2083,13 -2083,14 -2083,14 -2083,14 -2083,14 +2083,13 @@@@@@ static int soc_cleanup_card_resources(s
        /* remove auxiliary devices */
        soc_remove_aux_devices(card);
     
 ++++   snd_soc_dapm_free(&card->dapm);
        soc_cleanup_card_debugfs(card);
     
        /* remove the card */
        if (card->remove)
                card->remove(card);
     
 ----   snd_soc_dapm_free(&card->dapm);
 ----
        snd_card_free(card->snd_card);
        return 0;
     
@@@@@@ -3332,6 -3333,19 -3333,19 -3333,19 -3333,19 +3332,6 @@@@@@ int snd_soc_register_codec(struct devic
        if (ret)
                goto err_free;
     
 ----   if (codec_drv->controls) {
 ----           codec->component.controls = codec_drv->controls;
 ----           codec->component.num_controls = codec_drv->num_controls;
 ----   }
 ----   if (codec_drv->dapm_widgets) {
 ----           codec->component.dapm_widgets = codec_drv->dapm_widgets;
 ----           codec->component.num_dapm_widgets = codec_drv->num_dapm_widgets;
 ----   }
 ----   if (codec_drv->dapm_routes) {
 ----           codec->component.dapm_routes = codec_drv->dapm_routes;
 ----           codec->component.num_dapm_routes = codec_drv->num_dapm_routes;
 ----   }
 ----
        if (codec_drv->probe)
                codec->component.probe = snd_soc_codec_drv_probe;
        if (codec_drv->remove)
@@@@@@ -3719,7 -3733,7 -3733,7 -3733,7 -3733,7 +3719,7 @@@@@@ unsigned int snd_soc_of_parse_daifmt(st
         * SND_SOC_DAIFMT_CLOCK_MASK area
         */
        snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix);
----    if (of_get_property(np, prop, NULL))
++++    if (of_property_read_bool(np, prop))
                format |= SND_SOC_DAIFMT_CONT;
        else
                format |= SND_SOC_DAIFMT_GATED;