summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-01-31 16:36:11 -0600
committerBjorn Helgaas <bhelgaas@google.com>2017-01-31 16:36:11 -0600
commit6dc2c04fd9868a5ad00b402935021d6f3ff27b17 (patch)
treee7f9494e404cbe2d8cec1d6f644bae8428361b5c
parent7ce7d89f48834cefece7804d38fc5d85382edf77 (diff)
downloadop-kernel-dev-6dc2c04fd9868a5ad00b402935021d6f3ff27b17.zip
op-kernel-dev-6dc2c04fd9868a5ad00b402935021d6f3ff27b17.tar.gz
PCI: layerscape: Use of_device_get_match_data() to simplify probe
The only way to call ls_pcie_probe() is to match an entry in ls_pcie_of_match[], so match cannot be NULL. Use of_device_get_match_data() to retrieve the drvdata pointer. No functional change intended. Based-on-suggestion-from: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/host/pci-layerscape.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index ea78913..c1f06f8 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -239,23 +239,18 @@ 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 ls_pcie *pcie;
struct pcie_port *pp;
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;
pp = &pcie->pp;
pp->dev = dev;
- pcie->drvdata = match->data;
+ pcie->drvdata = of_device_get_match_data(dev);
pp->ops = pcie->drvdata->ops;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
OpenPOWER on IntegriCloud