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: Yangtao Li <frank.li@xxxxxxxx>
---
drivers/pci/controller/pci-v3-semi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index ca44b0c83d1b..0f993328dba2 100644
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -736,8 +736,7 @@ static int v3_pci_probe(struct platform_device *pdev)
return ret;
}
- regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- v3->base = devm_ioremap_resource(dev, regs);
+ v3->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(v3->base))
return PTR_ERR(v3->base);
/*
@@ -750,15 +749,14 @@ static int v3_pci_probe(struct platform_device *pdev)
readl(v3->base + V3_LB_IO_BASE), regs);
/* Configuration space is 16MB directly mapped */
- regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ v3->config_base = devm_platform_get_and_ioremap_resource(pdev, 1, &res);
+ if (IS_ERR(v3->config_base))
+ return PTR_ERR(v3->config_base);
if (resource_size(regs) != SZ_16M) {
dev_err(dev, "config mem is not 16MB!\n");
return -EINVAL;
}
v3->config_mem = regs->start;
- v3->config_base = devm_ioremap_resource(dev, regs);
- if (IS_ERR(v3->config_base))
- return PTR_ERR(v3->config_base);
/* Get and request error IRQ resource */
irq = platform_get_irq(pdev, 0);
--
2.39.0
