diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:11 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:11 -0600 |
| commit | f77b3244c18781d3b6bb7ffd7273a6c79d135f9e (patch) | |
| tree | 4244e0df6de05af30ec255d445ae31ea46593327 /drivers/pci | |
| parent | 44b83b32e7c8d6fcd6a7e877ce3db65f6afdf87c (diff) | |
| parent | 554d9ec7b4c3f4bd439333135882a873bd734b4e (diff) | |
| download | linux-f77b3244c18781d3b6bb7ffd7273a6c79d135f9e.tar.gz linux-f77b3244c18781d3b6bb7ffd7273a6c79d135f9e.tar.bz2 linux-f77b3244c18781d3b6bb7ffd7273a6c79d135f9e.zip | |
Merge branch 'pci/host-spear' into next
* pci/host-spear:
PCI: spear: Use builtin_platform_driver() to simplify the code
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pcie-spear13xx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c index 3cf197ba7f37..dafe8b88d97d 100644 --- a/drivers/pci/host/pcie-spear13xx.c +++ b/drivers/pci/host/pcie-spear13xx.c @@ -296,8 +296,4 @@ static struct platform_driver spear13xx_pcie_driver = { }, }; -static int __init spear13xx_pcie_init(void) -{ - return platform_driver_register(&spear13xx_pcie_driver); -} -device_initcall(spear13xx_pcie_init); +builtin_platform_driver(spear13xx_pcie_driver); |