Re: [PATCH] regulator: Use of_property_present() for testing DT property presence

[Matti Vaittinen]

On 3/10/23 16:47, Rob Herring wrote:
> 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. As
> part of this, convert of_get_property/of_find_property calls to the
> recently added of_property_present() helper when we just want to test
> for presence of a property and nothing more.
>
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>

Reviewed-by: Matti Vaittinen <mazziesaccount@xxxxxxxxx>

> ---
>   drivers/regulator/bd71815-regulator.c | 8 ++++----
>   drivers/regulator/fixed.c             | 2 +-
>   drivers/regulator/gpio-regulator.c    | 2 +-
>   drivers/regulator/pwm-regulator.c     | 2 +-
>   4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/regulator/bd71815-regulator.c b/drivers/regulator/bd71815-regulator.c
> index 8b55046eded8..f4eaea732de7 100644
> --- a/drivers/regulator/bd71815-regulator.c
> +++ b/drivers/regulator/bd71815-regulator.c
> @@ -201,10 +201,10 @@ static int buck12_set_hw_dvs_levels(struct device_node *np,
>   
>   	data = container_of(desc, struct bd71815_regulator, desc);
>   
> -	if (of_find_property(np, "rohm,dvs-run-voltage", NULL) ||
> -	    of_find_property(np, "rohm,dvs-suspend-voltage", NULL) ||
> -	    of_find_property(np, "rohm,dvs-lpsr-voltage", NULL) ||
> -	    of_find_property(np, "rohm,dvs-snvs-voltage", NULL)) {
> +	if (of_property_present(np, "rohm,dvs-run-voltage") ||
> +	    of_property_present(np, "rohm,dvs-suspend-voltage") ||
> +	    of_property_present(np, "rohm,dvs-lpsr-voltage") ||
> +	    of_property_present(np, "rohm,dvs-snvs-voltage")) {
>   		ret = regmap_read(cfg->regmap, desc->vsel_reg, &val);
>   		if (ret)
>   			return ret;
> diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
> index 2a9867abba20..7c3add05be15 100644
> --- a/drivers/regulator/fixed.c
> +++ b/drivers/regulator/fixed.c
> @@ -151,7 +151,7 @@ of_get_fixed_voltage_config(struct device *dev,
>   	of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
>   	of_property_read_u32(np, "off-on-delay-us", &config->off_on_delay);
>   
> -	if (of_find_property(np, "vin-supply", NULL))
> +	if (of_property_present(np, "vin-supply"))
>   		config->input_supply = "vin";
>   
>   	return config;
> diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
> index 95e61a2f43f5..7602d48609df 100644
> --- a/drivers/regulator/gpio-regulator.c
> +++ b/drivers/regulator/gpio-regulator.c
> @@ -220,7 +220,7 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
>   				 regtype);
>   	}
>   
> -	if (of_find_property(np, "vin-supply", NULL))
> +	if (of_property_present(np, "vin-supply"))
>   		config->input_supply = "vin";
>   
>   	return config;
> diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
> index b9eeaff1c661..214ea866742d 100644
> --- a/drivers/regulator/pwm-regulator.c
> +++ b/drivers/regulator/pwm-regulator.c
> @@ -334,7 +334,7 @@ static int pwm_regulator_probe(struct platform_device *pdev)
>   
>   	memcpy(&drvdata->desc, &pwm_regulator_desc, sizeof(drvdata->desc));
>   
> -	if (of_find_property(np, "voltage-table", NULL))
> +	if (of_property_present(np, "voltage-table"))
>   		ret = pwm_regulator_init_table(pdev, drvdata);
>   	else
>   		ret = pwm_regulator_init_continuous(pdev, drvdata);

--
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland

~~ When things go utterly wrong vim users can always type :help! ~~