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

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c
index f69d2fe6b84c..175c09e3a932 100644
--- a/drivers/pci/dwc/pci-layerscape.c
+++ b/drivers/pci/dwc/pci-layerscape.c
@@ -262,16 +262,11 @@ static int __init ls_add_pcie_port(struct ls_pcie *pcie)
 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 resource *dbi_base;
         int ret;
 
-        match = of_match_device(ls_pcie_of_match, dev);
-        if (!match)
-                return -ENODEV;
-
         pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
         if (!pcie)
                 return -ENOMEM;
@@ -280,7 +275,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
         if (!pci)
                 return -ENOMEM;
 
-        pcie->drvdata = match->data;
+        pcie->drvdata = of_device_get_match_data(dev);
 
         pci->dev = dev;
         pci->ops = pcie->drvdata->dw_pcie_ops;