Unverified Commit fa43ab13 authored by Chancel Liu's avatar Chancel Liu Committed by Mark Brown
Browse files

ASoC: fsl-asoc-card: Use of_property_present() for non-boolean properties 



The use of of_property_read_bool() for non-boolean properties is
deprecated in favor of of_property_present() when testing for property
presence.
Otherwise there'll be kernel warning:
[   29.018081] OF: /sound-wm8962: Read of boolean property 'hp-det-gpios' with a value.

Signed-off-by: default avatarChancel Liu <chancel.liu@nxp.com>
Link: https://patch.msgid.link/20251216071656.648412-1-chancel.liu@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d05d125f

sound/soc/fsl/fsl-asoc-card.c

+4 −4
Original line number Diff line number Diff line
@@ -1045,8 +1045,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	 * The notifier is initialized in snd_soc_card_jack_new(), then

	 * snd_soc_jack_notifier_register can be called.

	 */

	if (of_property_read_bool(np, "hp-det-gpios") ||

	    of_property_read_bool(np, "hp-det-gpio") /* deprecated */) {

	if (of_property_present(np, "hp-det-gpios") ||

	    of_property_present(np, "hp-det-gpio") /* deprecated */) {

		ret = simple_util_init_jack(&priv->card, &priv->hp_jack,

					    1, NULL, "Headphone Jack");

		if (ret)
@@ -1055,8 +1055,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		snd_soc_jack_notifier_register(&priv->hp_jack.jack, &hp_jack_nb);

	}



	if (of_property_read_bool(np, "mic-det-gpios") ||

	    of_property_read_bool(np, "mic-det-gpio") /* deprecated */) {

	if (of_property_present(np, "mic-det-gpios") ||

	    of_property_present(np, "mic-det-gpio") /* deprecated */) {

		ret = simple_util_init_jack(&priv->card, &priv->mic_jack,

					    0, NULL, "Mic Jack");

		if (ret)