samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Use of_property_read_bool()

Browse Source 
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>
This commit is contained in:
Rob Herring (Arm)
2024-07-31 13:12:58 -06:00
committed by Greg Kroah-Hartman
parent 29ea1abc7d
commit 54583776e4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/ak4613.c
View File

@@ -840,14 +840,14 @@ static void ak4613_parse_of(struct ak4613_priv *priv,
/* Input 1 - 2 */ /* Input 1 - 2 */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
snprintf(prop, sizeof(prop), "asahi-kasei,in%d-single-end", i + 1); 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; priv->ic |= 1 << i;
} }
/* Output 1 - 6 */ /* Output 1 - 6 */
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
snprintf(prop, sizeof(prop), "asahi-kasei,out%d-single-end", i + 1); 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; priv->oc |= 1 << i;
} }

8
sound/soc/soc-core.c
View File

@@ -3249,10 +3249,10 @@ unsigned int snd_soc_daifmt_parse_format(struct device_node *np,
* SND_SOC_DAIFMT_INV_MASK area * SND_SOC_DAIFMT_INV_MASK area
*/ */
snprintf(prop, sizeof(prop), "%sbitclock-inversion", prefix); 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); 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) { switch ((bit << 4) + frame) {
case 0x11: case 0x11:
@@ -3289,12 +3289,12 @@ unsigned int snd_soc_daifmt_parse_clock_provider_raw(struct device_node *np,
* check "[prefix]frame-master" * check "[prefix]frame-master"
*/ */
snprintf(prop, sizeof(prop), "%sbitclock-master", prefix); snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);
bit = !!of_get_property(np, prop, NULL); bit = of_property_read_bool(np, prop);
if (bit && bitclkmaster) if (bit && bitclkmaster)
*bitclkmaster = of_parse_phandle(np, prop, 0); *bitclkmaster = of_parse_phandle(np, prop, 0);
snprintf(prop, sizeof(prop), "%sframe-master", prefix); snprintf(prop, sizeof(prop), "%sframe-master", prefix);
frame = !!of_get_property(np, prop, NULL); frame = of_property_read_bool(np, prop);
if (frame && framemaster) if (frame && framemaster)
*framemaster = of_parse_phandle(np, prop, 0); *framemaster = of_parse_phandle(np, prop, 0);