diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-21 15:15:21 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-21 15:15:21 -0600 |
| commit | e2dc4f225b765c2a12e5eaa7bc09994e67d13741 (patch) | |
| tree | d016eb3a48b6c93d579b5dd269c6f065932ba7e2 | |
| parent | 68094b4b8d72360f9a90804c203e4292c6662fdd (diff) | |
| parent | 6dc2c04fd9868a5ad00b402935021d6f3ff27b17 (diff) | |
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
| -rw-r--r-- | drivers/pci/dwc/pci-layerscape.c | 7 |
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; |