PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code

[linux-2.6-microblaze.git] / drivers / pci / controller / dwc / pci-layerscape-ep.c

diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
index 84206f2..4d12efd 100644 (file)
--- a/drivers/pci/controller/dwc/pci-layerscape-ep.c
+++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c
@@ -18,8 +18,6 @@
 
 #include "pcie-designware.h"
 
-#define PCIE_DBI2_OFFSET               0x1000  /* DBI2 base address*/
-
 #define to_ls_pcie_ep(x)       dev_get_drvdata((x)->dev)
 
 struct ls_pcie_ep_drvdata {
@@ -124,34 +122,6 @@ static const struct of_device_id ls_pcie_ep_of_match[] = {
        { },
 };
 
-static int __init ls_add_pcie_ep(struct ls_pcie_ep *pcie,
-                                struct platform_device *pdev)
-{
-       struct dw_pcie *pci = pcie->pci;
-       struct device *dev = pci->dev;
-       struct dw_pcie_ep *ep;
-       struct resource *res;
-       int ret;
-
-       ep = &pci->ep;
-       ep->ops = pcie->drvdata->ops;
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");
-       if (!res)
-               return -EINVAL;
-
-       ep->phys_base = res->start;
-       ep->addr_size = resource_size(res);
-
-       ret = dw_pcie_ep_init(ep);
-       if (ret) {
-               dev_err(dev, "failed to initialize endpoint\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static int __init ls_pcie_ep_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -159,7 +129,6 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
        struct ls_pcie_ep *pcie;
        struct pci_epc_features *ls_epc;
        struct resource *dbi_base;
-       int ret;
 
        pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
        if (!pcie)
@@ -188,13 +157,11 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)
        if (IS_ERR(pci->dbi_base))
                return PTR_ERR(pci->dbi_base);
 
-       pci->dbi_base2 = pci->dbi_base + PCIE_DBI2_OFFSET;
+       pci->ep.ops = &ls_pcie_ep_ops;
 
        platform_set_drvdata(pdev, pcie);
 
-       ret = ls_add_pcie_ep(pcie, pdev);
-
-       return ret;
+       return dw_pcie_ep_init(&pci->ep);
 }
 
 static struct platform_driver ls_pcie_ep_driver = {