regulator: Use of_property_present() for testing DT property presence
authorRob Herring <robh@kernel.org>
Fri, 10 Mar 2023 14:47:21 +0000 (08:47 -0600)
committerMark Brown <broonie@kernel.org>
Sat, 11 Mar 2023 12:13:38 +0000 (12:13 +0000)
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@kernel.org>
Link: https://lore.kernel.org/r/20230310144721.1544756-1-robh@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/bd71815-regulator.c
drivers/regulator/fixed.c
drivers/regulator/gpio-regulator.c
drivers/regulator/pwm-regulator.c

index 8b55046eded87ece97e2bf23cbe98a33d5f371cf..f4eaea732de7c1045d6f1aac1d0e2fb3450a716b 100644 (file)
@@ -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;
index 2a9867abba20c256ea4304acd301ea988b7384ba..7c3add05be157bdafc4369f447d4e852360a8beb 100644 (file)
@@ -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;
index 95e61a2f43f5d11d00f30f764f0068195836b477..7602d48609df8b232a2d320959266ed40997d08e 100644 (file)
@@ -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;
index b9eeaff1c661507ca3cbc40c4da7c5c91e5125a8..214ea866742d899619bd016516653569918a97ad 100644 (file)
@@ -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);