diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-01 16:54:55 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-11 22:31:11 +0100 |
| commit | 85eb92e81801d64686eb78928d500a4c83ee9623 (patch) | |
| tree | aab5da45bc8861ab3882658922a0aa974f39e0f8 /drivers/bcma/driver_pci_host.c | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-85eb92e81801d64686eb78928d500a4c83ee9623.tar.xz linux-85eb92e81801d64686eb78928d500a4c83ee9623.zip | |
bcma: make it possible to specify a IRQ num in bcma_core_irq()
This moves bcma_core_irq() to main.c and add a extra parameter with a
number so that we can return different irq number for devices with more
than one.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/driver_pci_host.c')
| -rw-r--r-- | drivers/bcma/driver_pci_host.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c index c3d7b03c2fdc..c8a6b741967b 100644 --- a/drivers/bcma/driver_pci_host.c +++ b/drivers/bcma/driver_pci_host.c @@ -593,7 +593,7 @@ int bcma_core_pci_plat_dev_init(struct pci_dev *dev) pr_info("PCI: Fixing up device %s\n", pci_name(dev)); /* Fix up interrupt lines */ - dev->irq = bcma_core_irq(pc_host->pdev->core); + dev->irq = bcma_core_irq(pc_host->pdev->core, 0); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); readrq = pcie_get_readrq(dev); @@ -617,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev) pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host, pci_ops); - return bcma_core_irq(pc_host->pdev->core); + return bcma_core_irq(pc_host->pdev->core, 0); } EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq); |