* [PATCH] i2c: altera: use proper variable to hold errno
@ 2020-03-27 22:28 Wolfram Sang
2020-04-01 21:00 ` Thor Thayer
2020-04-09 14:00 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Wolfram Sang @ 2020-03-27 22:28 UTC (permalink / raw)
To: linux-i2c; +Cc: Thor Thayer, linux-renesas-soc, Wolfram Sang
device_property_read_u32() returns errno or 0, so we should use the
integer variable 'ret' and not the u32 'val' to hold the retval.
Fixes: 0560ad576268 ("i2c: altera: Add Altera I2C Controller driver")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Found while trying to refactor code handling "clock-frequency" property.
drivers/i2c/busses/i2c-altera.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-altera.c b/drivers/i2c/busses/i2c-altera.c
index 1de23b4f3809..92d2c706c2a7 100644
--- a/drivers/i2c/busses/i2c-altera.c
+++ b/drivers/i2c/busses/i2c-altera.c
@@ -384,7 +384,6 @@ static int altr_i2c_probe(struct platform_device *pdev)
struct altr_i2c_dev *idev = NULL;
struct resource *res;
int irq, ret;
- u32 val;
idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
if (!idev)
@@ -411,17 +410,17 @@ static int altr_i2c_probe(struct platform_device *pdev)
init_completion(&idev->msg_complete);
spin_lock_init(&idev->lock);
- val = device_property_read_u32(idev->dev, "fifo-size",
+ ret = device_property_read_u32(idev->dev, "fifo-size",
&idev->fifo_size);
- if (val) {
+ if (ret) {
dev_err(&pdev->dev, "FIFO size set to default of %d\n",
ALTR_I2C_DFLT_FIFO_SZ);
idev->fifo_size = ALTR_I2C_DFLT_FIFO_SZ;
}
- val = device_property_read_u32(idev->dev, "clock-frequency",
+ ret = device_property_read_u32(idev->dev, "clock-frequency",
&idev->bus_clk_rate);
- if (val) {
+ if (ret) {
dev_err(&pdev->dev, "Default to 100kHz\n");
idev->bus_clk_rate = 100000; /* default clock rate */
}
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] i2c: altera: use proper variable to hold errno
2020-03-27 22:28 [PATCH] i2c: altera: use proper variable to hold errno Wolfram Sang
@ 2020-04-01 21:00 ` Thor Thayer
2020-04-09 14:00 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Thor Thayer @ 2020-04-01 21:00 UTC (permalink / raw)
To: Wolfram Sang, linux-i2c; +Cc: linux-renesas-soc
On 3/27/20 5:28 PM, Wolfram Sang wrote:
> device_property_read_u32() returns errno or 0, so we should use the
> integer variable 'ret' and not the u32 'val' to hold the retval.
>
> Fixes: 0560ad576268 ("i2c: altera: Add Altera I2C Controller driver")
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>
> Found while trying to refactor code handling "clock-frequency" property.
>
> drivers/i2c/busses/i2c-altera.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-altera.c b/drivers/i2c/busses/i2c-altera.c
> index 1de23b4f3809..92d2c706c2a7 100644
> --- a/drivers/i2c/busses/i2c-altera.c
> +++ b/drivers/i2c/busses/i2c-altera.c
> @@ -384,7 +384,6 @@ static int altr_i2c_probe(struct platform_device *pdev)
> struct altr_i2c_dev *idev = NULL;
> struct resource *res;
> int irq, ret;
> - u32 val;
>
> idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
> if (!idev)
> @@ -411,17 +410,17 @@ static int altr_i2c_probe(struct platform_device *pdev)
> init_completion(&idev->msg_complete);
> spin_lock_init(&idev->lock);
>
> - val = device_property_read_u32(idev->dev, "fifo-size",
> + ret = device_property_read_u32(idev->dev, "fifo-size",
> &idev->fifo_size);
> - if (val) {
> + if (ret) {
> dev_err(&pdev->dev, "FIFO size set to default of %d\n",
> ALTR_I2C_DFLT_FIFO_SZ);
> idev->fifo_size = ALTR_I2C_DFLT_FIFO_SZ;
> }
>
> - val = device_property_read_u32(idev->dev, "clock-frequency",
> + ret = device_property_read_u32(idev->dev, "clock-frequency",
> &idev->bus_clk_rate);
> - if (val) {
> + if (ret) {
> dev_err(&pdev->dev, "Default to 100kHz\n");
> idev->bus_clk_rate = 100000; /* default clock rate */
> }
>
Reviewed-by: Thor Thayer <thor.thayer@linux.intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] i2c: altera: use proper variable to hold errno
2020-03-27 22:28 [PATCH] i2c: altera: use proper variable to hold errno Wolfram Sang
2020-04-01 21:00 ` Thor Thayer
@ 2020-04-09 14:00 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2020-04-09 14:00 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c, Thor Thayer, linux-renesas-soc
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
On Fri, Mar 27, 2020 at 11:28:26PM +0100, Wolfram Sang wrote:
> device_property_read_u32() returns errno or 0, so we should use the
> integer variable 'ret' and not the u32 'val' to hold the retval.
>
> Fixes: 0560ad576268 ("i2c: altera: Add Altera I2C Controller driver")
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-09 14:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-27 22:28 [PATCH] i2c: altera: use proper variable to hold errno Wolfram Sang
2020-04-01 21:00 ` Thor Thayer
2020-04-09 14:00 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox