Skip to contentSkip to conversation

i2c: wmt: Use devm_platform_get_and_ioremap_resource()

PATCH Applied [email protected] 3 participants 3 messages Jan 28, 2023 – Jun 14, 2023 I2C subsystem host drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/i2c/busses/i2c-wmt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/i2c/busses/i2c-wmt.c +1 -3
index 7d4bc8736079..4a3e3985e418 100644
@@ -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);
 
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Ye,

Quoted 24 lines · 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.

---
 drivers/i2c/busses/i2c-wmt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/i2c/busses/i2c-wmt.c +0 -1
index 7d4bc8736079..4a3e3985e418 100644
@@ -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;
 

drivers/i2c/busses/i2c-wmt.c static int wmt_i2c_probe(struct platform_device *pdev) · line 382

Quoted 6 lines
drivers/i2c/busses/i2c-wmt.c +1 -2
@@ -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.

Thanks,
Andi

Quoted 5 lines
drivers/i2c/busses/i2c-wmt.c +0 -0
 	if (IS_ERR(i2c_dev->base))
 		return PTR_ERR(i2c_dev->base);
 
Signature · 1 line
2.25.1
Applied
#2 lore raw
In reply to [email protected]
Quoted 7 lines · 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.

Applied to for-next, thanks!

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel