瀏覽代碼

PCI: rcar: Consolidate register space lookup and ioremap

Move the devm_ioremap_resource() of R-Car register space next to the
of_address_to_resource() that extracts the resource.  No functional change
intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Bjorn Helgaas 9 年之前
父節點
當前提交
51afa3cc2d
共有 1 個文件被更改,包括 4 次插入6 次删除
  1. 4 6
      drivers/pci/host/pcie-rcar.c

+ 4 - 6
drivers/pci/host/pcie-rcar.c

@@ -775,6 +775,10 @@ static int rcar_pcie_get_resources(struct platform_device *pdev,
 	if (err)
 	if (err)
 		return err;
 		return err;
 
 
+	pcie->base = devm_ioremap_resource(&pdev->dev, &res);
+	if (IS_ERR(pcie->base))
+		return PTR_ERR(pcie->base);
+
 	pcie->clk = devm_clk_get(&pdev->dev, "pcie");
 	pcie->clk = devm_clk_get(&pdev->dev, "pcie");
 	if (IS_ERR(pcie->clk)) {
 	if (IS_ERR(pcie->clk)) {
 		dev_err(pcie->dev, "cannot get platform clock\n");
 		dev_err(pcie->dev, "cannot get platform clock\n");
@@ -810,12 +814,6 @@ static int rcar_pcie_get_resources(struct platform_device *pdev,
 	}
 	}
 	pcie->msi.irq2 = i;
 	pcie->msi.irq2 = i;
 
 
-	pcie->base = devm_ioremap_resource(&pdev->dev, &res);
-	if (IS_ERR(pcie->base)) {
-		err = PTR_ERR(pcie->base);
-		goto err_map_reg;
-	}
-
 	return 0;
 	return 0;
 
 
 err_map_reg:
 err_map_reg: