ASoC: Use of_property_read_bool()

commit 69dd15a8ef0ae494179fd15023aa8172188db6b7 upstream.

Use of_property_read_bool() to read boolean properties rather than
of_get_property(). This is part of a larger effort to remove callers
of of_get_property() and similar functions. of_get_property() leaks
the DT property data pointer which is a problem for dynamically
allocated nodes which may be freed.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://patch.msgid.link/20240731191312.1710417-20-robh@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 619a817ee91cb8fc0f06362aedb3e9ba317d47cb..4c1318ce8ae58f63bc5c258f7a45ad232ddc4d74 100644 (file)
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -840,14 +840,14 @@ static void ak4613_parse_of(struct ak4613_priv *priv,
        /* Input 1 - 2 */
        for (i = 0; i < 2; i++) {
                snprintf(prop, sizeof(prop), "asahi-kasei,in%d-single-end", i + 1);
-               if (!of_get_property(np, prop, NULL))
+               if (!of_property_read_bool(np, prop))
                        priv->ic |= 1 << i;
        }
 
        /* Output 1 - 6 */
        for (i = 0; i < 6; i++) {
                snprintf(prop, sizeof(prop), "asahi-kasei,out%d-single-end", i + 1);
-               if (!of_get_property(np, prop, NULL))
+               if (!of_property_read_bool(np, prop))
                        priv->oc |= 1 << i;
        }
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e65fe3a7c3e42c69e2e47ee6df4efc9fa618b3d5..b9dfc10a9fc09955a3ea7ca67fa49f2caaee5d98 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3249,10 +3249,10 @@ unsigned int snd_soc_daifmt_parse_format(struct device_node *np,
         * SND_SOC_DAIFMT_INV_MASK area
         */
        snprintf(prop, sizeof(prop), "%sbitclock-inversion", prefix);
-       bit = !!of_get_property(np, prop, NULL);
+       bit = of_property_read_bool(np, prop);
 
        snprintf(prop, sizeof(prop), "%sframe-inversion", prefix);
-       frame = !!of_get_property(np, prop, NULL);
+       frame = of_property_read_bool(np, prop);
 
        switch ((bit << 4) + frame) {
        case 0x11:
@@ -3289,12 +3289,12 @@ unsigned int snd_soc_daifmt_parse_clock_provider_raw(struct device_node *np,
         * check "[prefix]frame-master"
         */
        snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);
-       bit = !!of_get_property(np, prop, NULL);
+       bit = of_property_read_bool(np, prop);
        if (bit && bitclkmaster)
                *bitclkmaster = of_parse_phandle(np, prop, 0);
 
        snprintf(prop, sizeof(prop), "%sframe-master", prefix);
-       frame = !!of_get_property(np, prop, NULL);
+       frame = of_property_read_bool(np, prop);
        if (frame && framemaster)
                *framemaster = of_parse_phandle(np, prop, 0);