From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Packham Date: Fri, 30 Jun 2017 00:54:07 +0000 Subject: [PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Message-Id: <20170630005408.23968-6-chris.packham@alliedtelesis.co.nz> List-Id: References: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> In-Reply-To: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: wsa@the-dreams.de, andy.shevchenko@gmail.com, linux-i2c@vger.kernel.org Cc: ysato@users.sourceforge.jp, linux-sh@vger.kernel.org, Chris Packham , linux-kernel@vger.kernel.org Use device_property_read_u32 instead of of_property_read_u32_index to lookup the "clock-frequency" property. Signed-off-by: Chris Packham --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752148AbdF3AzL (ORCPT ); Thu, 29 Jun 2017 20:55:11 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:46168 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751776AbdF3AyW (ORCPT ); Thu, 29 Jun 2017 20:54:22 -0400 From: Chris Packham To: wsa@the-dreams.de, andy.shevchenko@gmail.com, linux-i2c@vger.kernel.org Cc: ysato@users.sourceforge.jp, linux-sh@vger.kernel.org, Chris Packham , linux-kernel@vger.kernel.org Subject: [PATCH 5/6] i2c: pca-platform: use device_property_read_u32 Date: Fri, 30 Jun 2017 12:54:07 +1200 Message-Id: <20170630005408.23968-6-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> References: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use device_property_read_u32 instead of of_property_read_u32_index to lookup the "clock-frequency" property. Signed-off-by: Chris Packham --- 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