| Message ID | 20230310144706.1542434-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: Use of_property_present() for testing DT property presence | expand |
On Fri, Mar 10, 2023 at 08:47:06AM -0600, 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@kernel.org> Applied. Thanks, Guenter > --- > drivers/hwmon/ibmpowernv.c | 4 ++-- > drivers/hwmon/pwm-fan.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c > index 8e3724728cce..594254d6a72d 100644 > --- a/drivers/hwmon/ibmpowernv.c > +++ b/drivers/hwmon/ibmpowernv.c > @@ -456,9 +456,9 @@ static int populate_attr_groups(struct platform_device *pdev) > */ > if (!of_property_read_string(np, "label", &label)) > sensor_groups[type].attr_count++; > - if (of_find_property(np, "sensor-data-min", NULL)) > + if (of_property_present(np, "sensor-data-min")) > sensor_groups[type].attr_count++; > - if (of_find_property(np, "sensor-data-max", NULL)) > + if (of_property_present(np, "sensor-data-max")) > sensor_groups[type].attr_count++; > } > > diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c > index 83a347ca35da..57928d270015 100644 > --- a/drivers/hwmon/pwm-fan.c > +++ b/drivers/hwmon/pwm-fan.c > @@ -427,7 +427,7 @@ static int pwm_fan_of_get_cooling_data(struct device *dev, > struct device_node *np = dev->of_node; > int num, i, ret; > > - if (!of_find_property(np, "cooling-levels", NULL)) > + if (!of_property_present(np, "cooling-levels")) > return 0; > > ret = of_property_count_u32_elems(np, "cooling-levels");
diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c index 8e3724728cce..594254d6a72d 100644 --- a/drivers/hwmon/ibmpowernv.c +++ b/drivers/hwmon/ibmpowernv.c @@ -456,9 +456,9 @@ static int populate_attr_groups(struct platform_device *pdev) */ if (!of_property_read_string(np, "label", &label)) sensor_groups[type].attr_count++; - if (of_find_property(np, "sensor-data-min", NULL)) + if (of_property_present(np, "sensor-data-min")) sensor_groups[type].attr_count++; - if (of_find_property(np, "sensor-data-max", NULL)) + if (of_property_present(np, "sensor-data-max")) sensor_groups[type].attr_count++; } diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 83a347ca35da..57928d270015 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -427,7 +427,7 @@ static int pwm_fan_of_get_cooling_data(struct device *dev, struct device_node *np = dev->of_node; int num, i, ret; - if (!of_find_property(np, "cooling-levels", NULL)) + if (!of_property_present(np, "cooling-levels")) return 0; ret = of_property_count_u32_elems(np, "cooling-levels");
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> --- drivers/hwmon/ibmpowernv.c | 4 ++-- drivers/hwmon/pwm-fan.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)