aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-02-08 11:11:48 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-03-02 09:59:45 -0500
commit5b6ff664c8959d715e785b9465b042407a5d87a0 (patch)
treecc2ee177894f0d9b6ff4170d544278e7e7ae0f97 /drivers/bcma
parent4186721d02b71ae943e60bbf50d3488fd5fd6adb (diff)
bcma: change IRQ control function to accept bus as an argument
It doesn't operate on PCI core, but PCI host device, so there is no point of passing core related struct. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/bcma')
-rw-r--r--drivers/bcma/driver_pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index cf92bfa7eae0..cfd35bc1c5a3 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -282,21 +282,21 @@ void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)
282} 282}
283EXPORT_SYMBOL_GPL(bcma_core_pci_power_save); 283EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);
284 284
285int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core, 285int bcma_core_pci_irq_ctl(struct bcma_bus *bus, struct bcma_device *core,
286 bool enable) 286 bool enable)
287{ 287{
288 struct pci_dev *pdev; 288 struct pci_dev *pdev;
289 u32 coremask, tmp; 289 u32 coremask, tmp;
290 int err = 0; 290 int err = 0;
291 291
292 if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) { 292 if (bus->hosttype != BCMA_HOSTTYPE_PCI) {
293 /* This bcma device is not on a PCI host-bus. So the IRQs are 293 /* This bcma device is not on a PCI host-bus. So the IRQs are
294 * not routed through the PCI core. 294 * not routed through the PCI core.
295 * So we must not enable routing through the PCI core. */ 295 * So we must not enable routing through the PCI core. */
296 goto out; 296 goto out;
297 } 297 }
298 298
299 pdev = pc->core->bus->host_pci; 299 pdev = bus->host_pci;
300 300
301 err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp); 301 err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
302 if (err) 302 if (err)