i2c: pca-platform: use device_property_read_u32

Use device_property_read_u32 instead of of_property_read_u32_index to
lookup the "clock-frequency" property.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index b90193d09d4b24135e4d374876d692fe8faabab4..bc2707ffd4090289d3013f6b7f36f2d2a7b19c30 100644 (file)
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -177,16 +177,15 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
        if (IS_ERR(i2c->gpio))
                return PTR_ERR(i2c->gpio);
 
+       i2c->adap.timeout = HZ;
+       ret = device_property_read_u32(&pdev->dev, "clock-frequency",
+                                      &i2c->algo_data.i2c_clock);
+       if (ret)
+               i2c->algo_data.i2c_clock = 59000;
+
        if (platform_data) {
                i2c->adap.timeout = platform_data->timeout;
                i2c->algo_data.i2c_clock = platform_data->i2c_clock_speed;
-       } else if (np) {
-               i2c->adap.timeout = HZ;
-               of_property_read_u32_index(np, "clock-frequency", 0,
-                                          &i2c->algo_data.i2c_clock);
-       } else {
-               i2c->adap.timeout = HZ;
-               i2c->algo_data.i2c_clock = 59000;
        }
 
        i2c->algo_data.data = i2c;