ASoC: use of_property_read_bool

Use of_property_read_bool to check for the existence of a property.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e1,e2;
statement S2,S1;
@@
-       if (of_get_property(e1,e2,NULL))
+       if (of_property_read_bool(e1,e2))
        S1 else S2
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 2fc89155f14a1a2de2eddc2ca60c2f5f5c1190fb..1d4059cfc7645737768c152452b8497fcfd7eb30 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;

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 5f848f0547457338e122f5309914f3036c308836..6cb6db005fc45dd3e562fe480c0e353db7a6116a 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -928,7 +928,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
                }
 
                ops = &rsnd_ssi_non_ops;
-               if (of_get_property(np, "pio-transfer", NULL))
+               if (of_property_read_bool(np, "pio-transfer"))
                        ops = &rsnd_ssi_pio_ops;
                else
                        ops = &rsnd_ssi_dma_ops;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 16369cad480388c326f2463273e17ebef0324924..ead49d032e4cb0a89811e9eaa2915536a0848a60 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3733,7 +3733,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
         * 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;