FAILED: patch "[PATCH] ASoC: soc-core: Stop using of_property_read_bool() for" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 6eab70345799
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025050546-commute-subduing-1917@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6eab7034579917f207ca6d8e3f4e11e85e0ab7d5 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Wed, 22 Jan 2025 09:21:27 +0100
Subject: [PATCH] ASoC: soc-core: Stop using of_property_read_bool() for
non-boolean properties
On R-Car:
OF: /sound: Read of boolean property 'simple-audio-card,bitclock-master' with a value.
OF: /sound: Read of boolean property 'simple-audio-card,frame-master' with a value.
or:
OF: /soc/sound@ec500000/ports/port@0/endpoint: Read of boolean property 'bitclock-master' with a value.
OF: /soc/sound@ec500000/ports/port@0/endpoint: Read of boolean property 'frame-master' with a value.
The use of of_property_read_bool() for non-boolean properties is deprecated in favor of of_property_present() when testing for property presence.
Replace testing for presence before calling of_property_read_u32() by testing for an -EINVAL return value from the latter, to simplify the code.
sound/soc/soc-core.c +13 -19
@@ -3046,7 +3046,7 @@ int snd_soc_of_parse_pin_switches(struct snd_soc_card *card, const char *prop)unsigned int i, nb_controls;int ret; -if (!of_property_read_bool (dev->of_node, prop)) +if (!of_property_present (dev->of_node, prop))return 0 ; strings = devm_kcalloc(dev, nb_controls_max,
@@ -3120,23 +3120,17 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,if (rx_mask)snd_soc_of_get_slot_mask (np,"dai-tdm-slot-rx-mask" , rx_mask); -if (of_property_read_bool (np,"dai-tdm-slot-num" )) { - ret =of_property_read_u32 (np,"dai-tdm-slot-num" , &val); -if (ret) -return ret; + ret =of_property_read_u32 (np,"dai-tdm-slot-num" , &val); +if (ret && ret != -EINVAL ) +return ret; +if (!ret && slots) + *slots = val; -if (slots) - *slots = val; - } - -if (of_property_read_bool (np,"dai-tdm-slot-width" )) { - ret =of_property_read_u32 (np,"dai-tdm-slot-width" , &val); -if (ret) -return ret; - -if (slot_width) - *slot_width = val; - } + ret =of_property_read_u32 (np,"dai-tdm-slot-width" , &val); +if (ret && ret != -EINVAL ) +return ret; +if (!ret && slot_width) + *slot_width = val;return 0 ; }
@@ -3403,12 +3397,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_property_read_bool (np, prop); + bit =of_property_present (np, prop);if (bit && bitclkmaster) *bitclkmaster =of_parse_phandle (np, prop,0 );snprintf (prop,sizeof (prop),"%sframe-master" , prefix); - frame =of_property_read_bool (np, prop); + frame =of_property_present (np, prop);if (frame && framemaster) *framemaster =of_parse_phandle (np, prop,0 );