Merge branch 'pci/host-layerscape' into next

* pci/host-layerscape:
  PCI: layerscape: Use of_device_get_match_data() to simplify probe

Conflicts:
	drivers/pci/dwc/pci-layerscape.c

diff --cc drivers/pci/dwc/pci-layerscape.c
index f69d2fe6b84ca95ffeeca9a621dcfda03a6ada70,c1f06f8f05fd04f2d6e7acd4c4d6991345bd8df2..175c09e3a9326154f87cb05b4e532133c0f66155
--- 1/drivers/pci/dwc/pci-layerscape.c
--- 2/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/dwc/pci-layerscape.c
@@@ -262,9 -239,8 +262,8 @@@ static int __init ls_add_pcie_port(stru
  static int __init ls_pcie_probe(struct platform_device *pdev)
  {
        struct device *dev = &pdev->dev;
-       const struct of_device_id *match;
 +      struct dw_pcie *pci;
        struct ls_pcie *pcie;
 -      struct pcie_port *pp;
        struct resource *dbi_base;
        int ret;
  
@@@ -276,21 -248,17 +271,21 @@@
        if (!pcie)
                return -ENOMEM;
  
 -      pp = &pcie->pp;
 -      pp->dev = dev;
 +      pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
 +      if (!pci)
 +              return -ENOMEM;
 +
-       pcie->drvdata = match->data;
+       pcie->drvdata = of_device_get_match_data(dev);
 -      pp->ops = pcie->drvdata->ops;
 +
 +      pci->dev = dev;
 +      pci->ops = pcie->drvdata->dw_pcie_ops;
  
        dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
 -      pcie->pp.dbi_base = devm_ioremap_resource(dev, dbi_base);
 -      if (IS_ERR(pcie->pp.dbi_base))
 -              return PTR_ERR(pcie->pp.dbi_base);
 +      pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
 +      if (IS_ERR(pci->dbi_base))
 +              return PTR_ERR(pci->dbi_base);
  
 -      pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset;
 +      pcie->lut = pci->dbi_base + pcie->drvdata->lut_offset;
  
        if (!ls_pcie_is_bridge(pcie))
                return -ENODEV;