clk: use devm_platform_get_and_ioremap_resource()

Commit Message

[e-mail] Nov. 22, 2022, 1:48 a.m. UTC

From: Minghao Chi <[e-mail]>

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: Minghao Chi <[e-mail]>
Signed-off-by: ye xingchen <[e-mail]>
---
 drivers/clk/clk-bm1880.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Stephen Boyd Dec. 9, 2022, 8:25 p.m. UTC | #1

Quoting [e-mail] (2022-11-21 17:48:41)
> From: Minghao Chi <[e-mail]>
> 
> 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: Minghao Chi <[e-mail]>
> Signed-off-by: ye xingchen <[e-mail]>

Please fix the subject.

 $ git log --oneline -2 -- drivers/clk/clk-bm1880.c
 c861c1be3897 clk: bm1880: remove kfrees on static allocations
 59ef4da4e408 clk: bm1800: Remove set but not used variable 'fref'

And then get Mani to ack it.

Patch

diff --git a/drivers/clk/clk-bm1880.c b/drivers/clk/clk-bm1880.c
index fad78a22218e..1013be67254b 100644
--- a/drivers/clk/clk-bm1880.c
+++ b/drivers/clk/clk-bm1880.c
@@ -876,16 +876,13 @@  static int bm1880_clk_probe(struct platform_device *pdev)
 	struct bm1880_clock_data *clk_data;
 	void __iomem *pll_base, *sys_base;
 	struct device *dev = &pdev->dev;
-	struct resource *res;
 	int num_clks, i;

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

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