macintosh: Use of_property_present() for testing DT property presence
authorRob Herring <robh@kernel.org>
Fri, 10 Mar 2023 14:47:35 +0000 (08:47 -0600)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 30 Mar 2023 12:36:35 +0000 (23:36 +1100)
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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230310144735.1546817-1-robh@kernel.org
drivers/macintosh/rack-meter.c
drivers/macintosh/therm_adt746x.c

index c28893e..40240bc 100644 (file)
@@ -387,7 +387,7 @@ static int rackmeter_probe(struct macio_dev* mdev,
               if (of_node_name_eq(np, "lightshow"))
                       break;
               if (of_node_name_eq(np, "sound") &&
-                  of_get_property(np, "virtual", NULL) != NULL)
+                  of_property_present(np, "virtual"))
                       break;
        }
        if (np == NULL) {
index 8f5db90..384b87d 100644 (file)
@@ -483,7 +483,7 @@ static int probe_thermostat(struct i2c_client *client)
        if (vers != 1)
                return -ENXIO;
 
-       if (of_get_property(np, "hwsensor-location", NULL)) {
+       if (of_property_present(np, "hwsensor-location")) {
                for (i = 0; i < 3; i++) {
                        sensor_location[i] = of_get_property(np,
                                        "hwsensor-location", NULL) + offset;