i2c: powermac: Simplify reading the "reg" and "i2c-address" property
authorAishwarya R <aishwaryarj100@gmail.com>
Wed, 8 Apr 2020 10:03:53 +0000 (15:33 +0530)
committerWolfram Sang <wsa@the-dreams.de>
Sun, 26 Apr 2020 08:31:27 +0000 (10:31 +0200)
Use of_property_read_u32 to read the "reg" and "i2c-address" property
instead of using of_get_property to check the return values.

Signed-off-by: Aishwarya R <aishwaryarj100@gmail.com>
Tested-by: Erhard Furtner <erhard_f@mailbox.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-powermac.c

index d565714c1f13adb5fc3867635212eaad956c1d2d..81506c2dab657b1c9dd283edc7ad764f72bba4f6 100644 (file)
@@ -207,18 +207,18 @@ static u32 i2c_powermac_get_addr(struct i2c_adapter *adap,
                                           struct pmac_i2c_bus *bus,
                                           struct device_node *node)
 {
-       const __be32 *prop;
-       int len;
+       u32 prop;
+       int ret;
 
        /* First check for valid "reg" */
-       prop = of_get_property(node, "reg", &len);
-       if (prop && (len >= sizeof(int)))
-               return (be32_to_cpup(prop) & 0xff) >> 1;
+       ret = of_property_read_u32(node, "reg", &prop);
+       if (ret == 0)
+               return (prop & 0xff) >> 1;
 
        /* Then check old-style "i2c-address" */
-       prop = of_get_property(node, "i2c-address", &len);
-       if (prop && (len >= sizeof(int)))
-               return (be32_to_cpup(prop) & 0xff) >> 1;
+       ret = of_property_read_u32(node, "i2c-address", &prop);
+       if (ret == 0)
+               return (prop & 0xff) >> 1;
 
        /* Now handle some devices with missing "reg" properties */
        if (of_node_name_eq(node, "cereal"))