[PATCH 5/6] i2c: pca-platform: use device_property_read_u32

From	Chris Packham <chris.packham@alliedtelesis.co.nz>
Newsgroups	linux.kernel
Subject	[PATCH 5/6] i2c: pca-platform: use device_property_read_u32
Date	2017-06-30 03:00 +0200
Message-ID	<tXSrT-6F8-11@gated-at.bofh.it> (permalink)
References	<tXSrT-6F8-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 drivers/i2c/busses/i2c-pca-platform.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 1e3c247de8f8..80420f753a87 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -176,13 +176,12 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
 	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;
+		ret = device_property_read_u32(&pdev->dev, "clock-frequency",
+					       &i2c->algo_data.i2c_clock);
+		if (ret)
+			i2c->algo_data.i2c_clock = 59000;
 	}
 
 	i2c->gpio = devm_gpiod_get_optional(&pdev->dev, "reset-gpios", GPIOD_OUT_LOW);
-- 
2.13.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Chris Packham <chris.packham@alliedtelesis.co.nz> - 2017-06-30 03:00 +0200
  Re: [PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-30 10:50 +0200
    Re: [PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Wolfram Sang <wsa@the-dreams.de> - 2017-06-30 11:10 +0200
      Re: [PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-30 13:00 +0200
        Re: [PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Chris Packham <Chris.Packham@alliedtelesis.co.nz> - 2017-07-03 00:00 +0200

csiph-web