From 6dc2c04fd9868a5ad00b402935021d6f3ff27b17 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 31 Jan 2017 16:36:11 -0600 Subject: [PATCH] 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 Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-layerscape.c | 7 +------ 1 file changed, 1 insertion(+), 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"); -- 2.7.4