ASoC: Use of_property_read_bool() for boolean properties
Subsystems (5)
PATCH 1/1 ASoC: Use of_property_read_bool() for boolean properties
It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. Convert reading boolean properties to to of_property_read_bool().
--- sound/soc/codecs/sta32x.c | 39 +++++++++++------------ sound/soc/codecs/sta350.c | 63 +++++++++++++++++--------------------- sound/soc/codecs/tas5086.c | 2 +- sound/soc/fsl/fsl_sai.c | 12 ++++---- sound/soc/fsl/fsl_ssi.c | 2 +- sound/soc/fsl/imx-card.c | 2 +- sound/soc/sh/rcar/ssi.c | 4 +-- 7 files changed, 57 insertions(+), 67 deletions(-)
sound/soc/codecs/sta32x.c +18 -21
@@ -1054,35 +1054,32 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x)of_property_read_u8 (np,"st,ch3-output-mapping" , &pdata->ch3_output_mapping); -if (of_get_property (np,"st,fault-detect-recovery" ,NULL )) - pdata->fault_detect_recovery =1 ; -if (of_get_property (np,"st,thermal-warning-recovery" ,NULL )) - pdata->thermal_warning_recovery =1 ; -if (of_get_property (np,"st,thermal-warning-adjustment" ,NULL )) - pdata->thermal_warning_adjustment =1 ; -if (of_get_property (np,"st,needs_esd_watchdog" ,NULL )) - pdata->needs_esd_watchdog =1 ; + pdata->fault_detect_recovery = +of_property_read_bool (np,"st,fault-detect-recovery" ); + pdata->thermal_warning_recovery = +of_property_read_bool (np,"st,thermal-warning-recovery" ); + pdata->thermal_warning_adjustment = +of_property_read_bool (np,"st,thermal-warning-adjustment" ); + pdata->needs_esd_watchdog = +of_property_read_bool (np,"st,needs_esd_watchdog" ); tmp =140 ;of_property_read_u16 (np,"st,drop-compensation-ns" , &tmp); pdata->drop_compensation_ns =clamp_t (u16, tmp,0 ,300 ) /20 ;/* CONFE */ -if (of_get_property (np,"st,max-power-use-mpcc" ,NULL )) - pdata->max_power_use_mpcc =1 ; - -if (of_get_property (np,"st,max-power-correction" ,NULL )) - pdata->max_power_correction =1 ; - -if (of_get_property (np,"st,am-reduction-mode" ,NULL )) - pdata->am_reduction_mode =1 ; - -if (of_get_property (np,"st,odd-pwm-speed-mode" ,NULL )) - pdata->odd_pwm_speed_mode =1 ; + pdata->max_power_use_mpcc = +of_property_read_bool (np,"st,max-power-use-mpcc" ); + pdata->max_power_correction = +of_property_read_bool (np,"st,max-power-correction" ); + pdata->am_reduction_mode = +of_property_read_bool (np,"st,am-reduction-mode" ); + pdata->odd_pwm_speed_mode = +of_property_read_bool (np,"st,odd-pwm-speed-mode" );/* CONFF */ -if (of_get_property (np,"st,invalid-input-detect-mute" ,NULL )) - pdata->invalid_input_detect_mute =1 ; + pdata->invalid_input_detect_mute = +of_property_read_bool (np,"st,invalid-input-detect-mute" ); sta32x->pdata = pdata;
sound/soc/codecs/sta350.c +28 -35
81 lines not on this page · raw message
sound/soc/codecs/tas5086.c +1 -1
@@ -840,7 +840,7 @@ static int tas5086_probe(struct snd_soc_component *component)snprintf (name,sizeof (name),"ti,mid-z-channel-%d" , i +1 ); -if (of_get_property (of_node, name,NULL ) !=NULL ) +if (of_property_read_bool (of_node, name)) priv->pwm_start_mid_z |=1 << i; } }
sound/soc/fsl/fsl_sai.c +6 -6
@@ -1380,18 +1380,18 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->cpu_dai_drv.symmetric_channels =1 ; sai->cpu_dai_drv.symmetric_sample_bits =1 ; -if (of_find_property (np,"fsl,sai-synchronous-rx" ,NULL ) && -of_find_property (np,"fsl,sai-asynchronous" ,NULL )) { +if (of_property_read_bool (np,"fsl,sai-synchronous-rx" ) && +of_property_read_bool (np,"fsl,sai-asynchronous" )) {/* error out if both synchronous and asynchronous are present */ dev_err (dev,"invalid binding for synchronous mode\n" );return -EINVAL ; } -if (of_find_property (np,"fsl,sai-synchronous-rx" ,NULL )) { +if (of_property_read_bool (np,"fsl,sai-synchronous-rx" )) {/* Sync Rx with Tx */ sai->synchronous[RX ] = false; sai->synchronous[TX ] = true; - }else if (of_find_property (np,"fsl,sai-asynchronous" ,NULL )) { + }else if (of_property_read_bool (np,"fsl,sai-asynchronous" )) {/* Discard all settings for asynchronous mode */ sai->synchronous[RX ] = false; sai->synchronous[TX ] = false;
@@ -1400,7 +1400,7 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->cpu_dai_drv.symmetric_sample_bits =0 ; } -if (of_find_property (np,"fsl,sai-mclk-direction-output" ,NULL ) && +if (of_property_read_bool (np,"fsl,sai-mclk-direction-output" ) &&of_device_is_compatible (np,"fsl,imx6ul-sai" )) { gpr =syscon_regmap_lookup_by_compatible ("fsl,imx6ul-iomuxc-gpr" );if (IS_ERR (gpr)) {
@@ -1443,7 +1443,7 @@ static int fsl_sai_probe(struct platform_device *pdev)dev_warn (dev,"Error reading SAI version: %d\n" , ret);/* Select MCLK direction */ -if (of_find_property (np,"fsl,sai-mclk-direction-output" ,NULL ) && +if (of_property_read_bool (np,"fsl,sai-mclk-direction-output" ) && sai->soc_data->max_register >=FSL_SAI_MCTL ) {regmap_update_bits (sai->regmap,FSL_SAI_MCTL ,FSL_SAI_MCTL_MCLK_EN ,FSL_SAI_MCTL_MCLK_EN );
sound/soc/fsl/fsl_ssi.c +1 -1
@@ -1447,7 +1447,7 @@ static int fsl_ssi_probe_from_dt(struct fsl_ssi *ssi)return -EINVAL ; }strcpy (ssi->card_name,"ac97-codec" ); - }else if (!of_find_property (np,"fsl,ssi-asynchronous" ,NULL )) { + }else if (!of_property_read_bool (np,"fsl,ssi-asynchronous" )) {/* * In synchronous mode, STCK and STFS ports are used by RX * as well. So the software should limit the sample rates,
sound/soc/fsl/imx-card.c +1 -1
@@ -563,7 +563,7 @@ static int imx_card_parse_of(struct imx_card_data *data) link_data->cpu_sysclk_id =FSL_SAI_CLK_MAST1 ;/* sai may support mclk/bclk = 1 */ -if (of_find_property (np,"fsl,mclk-equal-bclk" ,NULL )) { +if (of_property_read_bool (np,"fsl,mclk-equal-bclk" )) { link_data->one2one_ratio = true; }else {int i;
sound/soc/sh/rcar/ssi.c +2 -2
@@ -1211,10 +1211,10 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) goto rsnd_ssi_probe_done; } -if (of_get_property (np,"shared-pin" ,NULL )) +if (of_property_read_bool (np,"shared-pin" ))rsnd_flags_set (ssi,RSND_SSI_CLK_PIN_SHARE ); -if (of_get_property (np,"no-busif" ,NULL )) +if (of_property_read_bool (np,"no-busif" ))rsnd_flags_set (ssi,RSND_SSI_NO_BUSIF ); ssi->irq =irq_of_parse_and_map (np,0 );
Signature · 1 line
2.39.2
Mark Brown
maintainerQuoted 6 lines · Rob Herring
It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. Convert reading boolean properties to to
of_property_read_bool().
Applied to
broonie/sound.git for-next
Thanks!
[1/1] ASoC: Use of_property_read_bool() for boolean properties
commit: 2d2998b84330899bf88a0414f3356869be4a69eb
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