Use devm_platform_ioremap_resource_byname() in order to simplify the
logic and to make the logic for Kirin 970 similar to the one for Kirin
960.

Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
---
 drivers/pci/controller/dwc/pcie-kirin.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-kirin.c 
b/drivers/pci/controller/dwc/pcie-kirin.c
index f46a51ffd2c8..e1ebe0747978 100644
--- a/drivers/pci/controller/dwc/pcie-kirin.c
+++ b/drivers/pci/controller/dwc/pcie-kirin.c
@@ -297,13 +297,13 @@ static long kirin960_pcie_get_resource(struct kirin_pcie 
*kirin_pcie,
 {
        struct device *dev = &pdev->dev;
 
-       kirin_pcie->apb_base =
-               devm_platform_ioremap_resource_byname(pdev, "apb");
+       kirin_pcie->apb_base = devm_platform_ioremap_resource_byname(pdev,
+                                                                    "apb");
        if (IS_ERR(kirin_pcie->apb_base))
                return PTR_ERR(kirin_pcie->apb_base);
 
-       kirin_pcie->phy_base =
-               devm_platform_ioremap_resource_byname(pdev, "phy");
+       kirin_pcie->phy_base = devm_platform_ioremap_resource_byname(pdev,
+                                                                    "phy");
        if (IS_ERR(kirin_pcie->phy_base))
                return PTR_ERR(kirin_pcie->phy_base);
 
@@ -329,23 +329,20 @@ static long kirin970_pcie_get_resource(struct kirin_pcie 
*kirin_pcie,
                                      struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct resource *apb;
-       struct resource *phy;
-       struct resource *dbi;
        int ret;
 
-       apb = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apb");
-       kirin_pcie->apb_base = devm_ioremap_resource(dev, apb);
+       kirin_pcie->apb_base = devm_platform_ioremap_resource_byname(pdev,
+                                                                    "apb");
        if (IS_ERR(kirin_pcie->apb_base))
                return PTR_ERR(kirin_pcie->apb_base);
 
-       phy = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
-       kirin_pcie->phy_base = devm_ioremap_resource(dev, phy);
+       kirin_pcie->phy_base = devm_platform_ioremap_resource_byname(pdev,
+                                                                    "phy");
        if (IS_ERR(kirin_pcie->phy_base))
                return PTR_ERR(kirin_pcie->phy_base);
 
-       dbi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
-       kirin_pcie->pci->dbi_base = devm_ioremap_resource(dev, dbi);
+       kirin_pcie->pci->dbi_base = devm_platform_ioremap_resource_byname(pdev,
+                                                                         
"dbi");
        if (IS_ERR(kirin_pcie->pci->dbi_base))
                return PTR_ERR(kirin_pcie->pci->dbi_base);
 
-- 
2.29.2

Reply via email to