ASoC: Use of_property_present() for non-boolean properties
Subsystems (9)
PATCH 1/1 ASoC: 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.
--- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/fsl/imx-audmux.c | 2 +- sound/soc/fsl/imx-card.c | 2 +- sound/soc/fsl/imx-rpmsg.c | 2 +- sound/soc/generic/simple-card-utils.c | 4 ++-- sound/soc/intel/keembay/kmb_platform.c | 2 +- sound/soc/mediatek/common/mtk-soundcard-driver.c | 4 ++-- sound/soc/qcom/common.c | 6 +++--- sound/soc/qcom/sc7180.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-)
sound/soc/fsl/fsl-asoc-card.c +1 -1
@@ -932,7 +932,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)if (!asrc_pdev) priv->card.num_dapm_routes /=2 ; -if (of_property_read_bool (np,"audio-routing" )) { +if (of_property_present (np,"audio-routing" )) { ret =snd_soc_of_parse_audio_routing (&priv->card,"audio-routing" );if (ret) {dev_err (&pdev->dev,"failed to parse audio-routing: %d\n" , ret);
sound/soc/fsl/imx-audmux.c +1 -1
@@ -237,7 +237,7 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev, child);continue ; } -if (!of_property_read_bool (child,"fsl,port-config" )) { +if (!of_property_present (child,"fsl,port-config" )) {dev_warn (&pdev->dev,"child node \"%pOF\" does not have property fsl,port-config\n" , child);continue ;
sound/soc/fsl/imx-card.c +1 -1
@@ -529,7 +529,7 @@ static int imx_card_parse_of(struct imx_card_data *data) }/* DAPM routes */ -if (of_property_read_bool (dev->of_node,"audio-routing" )) { +if (of_property_present (dev->of_node,"audio-routing" )) { ret =snd_soc_of_parse_audio_routing (card,"audio-routing" );if (ret)return ret;
sound/soc/fsl/imx-rpmsg.c +1 -1
@@ -218,7 +218,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev)if (ret) goto fail; -if (of_property_read_bool (np,"audio-routing" )) { +if (of_property_present (np,"audio-routing" )) { ret =snd_soc_of_parse_audio_routing (&data->card,"audio-routing" );if (ret) {dev_err (&pdev->dev,"failed to parse audio-routing: %d\n" , ret);
sound/soc/generic/simple-card-utils.c +2 -2
@@ -713,7 +713,7 @@ int simple_util_parse_routing(struct snd_soc_card *card,snprintf (prop,sizeof (prop),"%s%s" , prefix,"routing" ); -if (!of_property_read_bool (node, prop)) +if (!of_property_present (node, prop))return 0 ;return snd_soc_of_parse_audio_routing (card, prop);
@@ -731,7 +731,7 @@ int simple_util_parse_widgets(struct snd_soc_card *card,snprintf (prop,sizeof (prop),"%s%s" , prefix,"widgets" ); -if (of_property_read_bool (node, prop)) +if (of_property_present (node, prop))return snd_soc_of_parse_audio_simple_widgets (card, prop);/* no widgets is not error */
sound/soc/intel/keembay/kmb_platform.c +1 -1
@@ -869,7 +869,7 @@ static int kmb_plat_dai_probe(struct platform_device *pdev) kmb_i2s->fifo_th = (1 <<COMP1_FIFO_DEPTH (comp1_reg)) /2 ; - kmb_i2s->use_pio = !(of_property_read_bool (np,"dmas" )); + kmb_i2s->use_pio = !of_property_present (np,"dmas" );if (kmb_i2s->use_pio) { irq =platform_get_irq_optional (pdev,0 );
sound/soc/mediatek/common/mtk-soundcard-driver.c +2 -2
@@ -221,7 +221,7 @@ int mtk_soundcard_common_probe(struct platform_device *pdev) card->name = pdata->card_name; } - needs_legacy_probe = !of_property_read_bool (pdev->dev.of_node,"audio-routing" ); + needs_legacy_probe = !of_property_present (pdev->dev.of_node,"audio-routing" );if (needs_legacy_probe) {/* * If we have no .soc_probe() callback there's no way of using
@@ -262,7 +262,7 @@ int mtk_soundcard_common_probe(struct platform_device *pdev) adsp_node =NULL ;if (adsp_node) { -if (of_property_read_bool (pdev->dev.of_node,"mediatek,dai-link" )) { +if (of_property_present (pdev->dev.of_node,"mediatek,dai-link" )) { ret =mtk_sof_dailink_parse_of (card, pdev->dev.of_node,"mediatek,dai-link" , card->dai_link, card->num_links);
sound/soc/qcom/common.c +3 -3
@@ -44,20 +44,20 @@ int qcom_snd_parse_of(struct snd_soc_card *card)return ret; } -if (of_property_read_bool (dev->of_node,"widgets" )) { +if (of_property_present (dev->of_node,"widgets" )) { ret =snd_soc_of_parse_audio_simple_widgets (card,"widgets" );if (ret)return ret; }/* DAPM routes */ -if (of_property_read_bool (dev->of_node,"audio-routing" )) { +if (of_property_present (dev->of_node,"audio-routing" )) { ret =snd_soc_of_parse_audio_routing (card,"audio-routing" );if (ret)return ret; }/* Deprecated, only for compatibility with old device trees */ -if (of_property_read_bool (dev->of_node,"qcom,audio-routing" )) { +if (of_property_present (dev->of_node,"qcom,audio-routing" )) { ret =snd_soc_of_parse_audio_routing (card,"qcom,audio-routing" );if (ret)return ret;
sound/soc/qcom/sc7180.c +1 -1
@@ -513,7 +513,7 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev) card->controls = sc7180_snd_controls; card->num_controls =ARRAY_SIZE (sc7180_snd_controls); -if (of_property_read_bool (dev->of_node,"dmic-gpios" )) { +if (of_property_present (dev->of_node,"dmic-gpios" )) { card->dapm_widgets = sc7180_snd_dual_mic_widgets, card->num_dapm_widgets =ARRAY_SIZE (sc7180_snd_dual_mic_widgets), card->controls = sc7180_snd_dual_mic_controls,
Signature · 1 line
2.45.2
Mark Brown
maintainerQuoted 5 lines · Rob Herring (Arm)
The use of
of_property_read_bool()for non-boolean properties is deprecated in favor ofof_property_present()when testing for property presence.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: Use of_property_present() for non-boolean properties
commit: 84eac6d478c00f8f9101f91716ea3866d2fc1e54
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark