Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc...

[cascardo/linux.git] / sound / soc / codecs / ab8500-codec.c

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 2fc8915..935ff7c 100644 (file)
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2408,28 +2408,28 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np,
 {
        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,12 +2525,14 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
 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)