android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pci/host-xgene' into next

Browse Source 
* pci/host-xgene:
  PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
This commit is contained in:
Bjorn Helgaas
2017-11-14 12:11:37 -06:00
parent e9cd973f2b 92e31454f1
commit 5164e38a17
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/host/pci-xgene.c
View File

@ -610,7 +610,7 @@ static struct pci_ops xgene_pcie_ops = {
.write = pci_generic_config_write32, .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 *dev = &pdev->dev;
struct device_node *dn = dev->of_node; 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), .of_match_table = of_match_ptr(xgene_pcie_match_table),
.suppress_bind_attrs = true, .suppress_bind_attrs = true,
}, },
.probe = xgene_pcie_probe_bridge, .probe = xgene_pcie_probe,
}; };
builtin_platform_driver(xgene_pcie_driver); builtin_platform_driver(xgene_pcie_driver);
#endif #endif