Commit b7fa64ec authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/resources' 

- Use Use devm_platform_get_and_ioremap_resource() instead of open-coding
  platform_get_resource() followed by devm_ioremap_resource() (Yang Li)

* pci/controller/resources:
  PCI: imx6: Use devm_platform_get_and_ioremap_resource()
  PCI: xgene-msi: Use devm_platform_get_and_ioremap_resource()
  PCI: v3: Use devm_platform_get_and_ioremap_resource()
  PCI: rcar-gen2: Use devm_platform_get_and_ioremap_resource()
parents 6cef1263 188f46ca

drivers/pci/controller/dwc/pci-imx6.c

+1 −2
Original line number Diff line number Diff line
@@ -1283,8 +1283,7 @@ static int imx6_pcie_probe(struct platform_device *pdev) 
			return PTR_ERR(imx6_pcie->phy_base);

	}



	dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pci->dbi_base = devm_ioremap_resource(dev, dbi_base);

	pci->dbi_base = devm_platform_get_and_ioremap_resource(pdev, 0, &dbi_base);

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);

drivers/pci/controller/pci-rcar-gen2.c

+1 −2
Original line number Diff line number Diff line
@@ -290,8 +290,7 @@ static int rcar_pci_probe(struct platform_device *pdev) 
	priv = pci_host_bridge_priv(bridge);

	bridge->sysdata = priv;



	cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	reg = devm_ioremap_resource(dev, cfg_res);

	reg = devm_platform_get_and_ioremap_resource(pdev, 0, &cfg_res);

	if (IS_ERR(reg))

		return PTR_ERR(reg);

drivers/pci/controller/pci-v3-semi.c

+1 −2
Original line number Diff line number Diff line
@@ -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, &regs);

	if (IS_ERR(v3->base))

		return PTR_ERR(v3->base);

	/*

drivers/pci/controller/pci-xgene-msi.c

+1 −2
Original line number Diff line number Diff line
@@ -441,8 +441,7 @@ static int xgene_msi_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, xgene_msi);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	xgene_msi->msi_regs = devm_ioremap_resource(&pdev->dev, res);

	xgene_msi->msi_regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(xgene_msi->msi_regs)) {

		rc = PTR_ERR(xgene_msi->msi_regs);

		goto error;