2023-01-28 06:51:55

by ye.xingchen

[permalink] [raw]
Subject: [PATCH] i2c: wmt: Use devm_platform_get_and_ioremap_resource()

From: ye xingchen <[email protected]>

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: ye xingchen <[email protected]>
---
drivers/i2c/busses/i2c-wmt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
index 7d4bc8736079..4a3e3985e418 100644
--- a/drivers/i2c/busses/i2c-wmt.c
+++ b/drivers/i2c/busses/i2c-wmt.c
@@ -372,7 +372,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node;
struct wmt_i2c_dev *i2c_dev;
struct i2c_adapter *adap;
- struct resource *res;
int err;
u32 clk_rate;

@@ -380,8 +379,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)
if (!i2c_dev)
return -ENOMEM;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- i2c_dev->base = devm_ioremap_resource(&pdev->dev, res);
+ i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
if (IS_ERR(i2c_dev->base))
return PTR_ERR(i2c_dev->base);

--
2.25.1


2023-06-10 13:53:17

by Andi Shyti

[permalink] [raw]
Subject: Re: [PATCH] i2c: wmt: Use devm_platform_get_and_ioremap_resource()

Hi Ye,

On Sat, Jan 28, 2023 at 02:51:44PM +0800, [email protected] wrote:
> From: ye xingchen <[email protected]>
>
> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
>
> Signed-off-by: ye xingchen <[email protected]>
> ---
> drivers/i2c/busses/i2c-wmt.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
> index 7d4bc8736079..4a3e3985e418 100644
> --- a/drivers/i2c/busses/i2c-wmt.c
> +++ b/drivers/i2c/busses/i2c-wmt.c
> @@ -372,7 +372,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)
> struct device_node *np = pdev->dev.of_node;
> struct wmt_i2c_dev *i2c_dev;
> struct i2c_adapter *adap;
> - struct resource *res;
> int err;
> u32 clk_rate;
>
> @@ -380,8 +379,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)
> if (!i2c_dev)
> return -ENOMEM;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - i2c_dev->base = devm_ioremap_resource(&pdev->dev, res);
> + i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);

It's also a cleaner way to handle the error when res is NULL.

Reviewed-by: Andi Shyti <[email protected]>

Thanks,
Andi

> if (IS_ERR(i2c_dev->base))
> return PTR_ERR(i2c_dev->base);
>
> --
> 2.25.1

2023-06-14 09:23:15

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH] i2c: wmt: Use devm_platform_get_and_ioremap_resource()

On Sat, Jan 28, 2023 at 02:51:44PM +0800, [email protected] wrote:
> From: ye xingchen <[email protected]>
>
> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
>
> Signed-off-by: ye xingchen <[email protected]>

Applied to for-next, thanks!


Attachments:
(No filename) (388.00 B)
signature.asc (849.00 B)
Download all attachments