diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:40 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:40 -0500 |
commit | 7ba381c449fdfaae9768e092e1e8a87ac1459561 (patch) | |
tree | dd54bed354fddc2d39c0abf211bdc0303c6040ad /drivers/pci/controller/pcie-iproc-bcma.c | |
parent | Merge branch 'remotes/lorenzo/pci/imx6' (diff) | |
parent | PCI: iproc: Fix using plain integer as NULL pointer in iproc_pcie_pltfm_probe (diff) | |
download | linux-dev-7ba381c449fdfaae9768e092e1e8a87ac1459561.tar.xz linux-dev-7ba381c449fdfaae9768e092e1e8a87ac1459561.zip |
Merge branch 'remotes/lorenzo/pci/iproc'
- Set affinity mask on MSI interrupts (Mark Tomlinson)
- Simplify by using module_bcma_driver (Liu Shixin)
- Fix 'using integer as NULL pointer' warning (Krzysztof WilczyĆski)
* remotes/lorenzo/pci/iproc:
PCI: iproc: Fix using plain integer as NULL pointer in iproc_pcie_pltfm_probe
PCI: iproc: Use module_bcma_driver to simplify the code
PCI: iproc: Set affinity mask on MSI interrupts
Diffstat (limited to 'drivers/pci/controller/pcie-iproc-bcma.c')
-rw-r--r-- | drivers/pci/controller/pcie-iproc-bcma.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/pci/controller/pcie-iproc-bcma.c b/drivers/pci/controller/pcie-iproc-bcma.c index aa55b064f64d..56b8ee7bf330 100644 --- a/drivers/pci/controller/pcie-iproc-bcma.c +++ b/drivers/pci/controller/pcie-iproc-bcma.c @@ -94,18 +94,7 @@ static struct bcma_driver iproc_pcie_bcma_driver = { .probe = iproc_pcie_bcma_probe, .remove = iproc_pcie_bcma_remove, }; - -static int __init iproc_pcie_bcma_init(void) -{ - return bcma_driver_register(&iproc_pcie_bcma_driver); -} -module_init(iproc_pcie_bcma_init); - -static void __exit iproc_pcie_bcma_exit(void) -{ - bcma_driver_unregister(&iproc_pcie_bcma_driver); -} -module_exit(iproc_pcie_bcma_exit); +module_bcma_driver(iproc_pcie_bcma_driver); MODULE_AUTHOR("Hauke Mehrtens"); MODULE_DESCRIPTION("Broadcom iProc PCIe BCMA driver"); |