summaryrefslogtreecommitdiff
path: root/drivers/pci/host
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-11-14 12:11:37 -0600
committerBjorn Helgaas <bhelgaas@google.com>2017-11-14 12:11:37 -0600
commit5164e38a1793ed47362da0c1dc5e2e38597252f8 (patch)
tree11a43533be875dc4ac7fa69df44348f7d1b9cb09 /drivers/pci/host
parente9cd973f2bb28ef4f6ddd89c77708547af3bb183 (diff)
parent92e31454f1ee0a078baf418d6f1cc20a7109a87f (diff)
Merge branch 'pci/host-xgene' into next
* pci/host-xgene: PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
Diffstat (limited to 'drivers/pci/host')
-rw-r--r--drivers/pci/host/pci-xgene.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 8fc45d95edab..465aa2a1b38d 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -610,7 +610,7 @@ static struct pci_ops xgene_pcie_ops = {
.write = pci_generic_config_write32,
};
-static int xgene_pcie_probe_bridge(struct platform_device *pdev)
+static int xgene_pcie_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *dn = dev->of_node;
@@ -691,7 +691,7 @@ static struct platform_driver xgene_pcie_driver = {
.of_match_table = of_match_ptr(xgene_pcie_match_table),
.suppress_bind_attrs = true,
},
- .probe = xgene_pcie_probe_bridge,
+ .probe = xgene_pcie_probe,
};
builtin_platform_driver(xgene_pcie_driver);
#endif