2 files changed, 34 insertions, 33 deletions

diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index cfd35bc1c5a3..f499a469e66d 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -282,39 +282,6 @@ void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)
 }
 EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);
 
-int bcma_core_pci_irq_ctl(struct bcma_bus *bus, struct bcma_device *core,
-                          bool enable)
-{
-        struct pci_dev *pdev;
-        u32 coremask, tmp;
-        int err = 0;
-
-        if (bus->hosttype != BCMA_HOSTTYPE_PCI) {
-                /* This bcma device is not on a PCI host-bus. So the IRQs are
-                 * not routed through the PCI core.
-                 * So we must not enable routing through the PCI core. */
-                goto out;
-        }
-
-        pdev = bus->host_pci;
-
-        err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
-        if (err)
-                goto out;
-
-        coremask = BIT(core->core_index) << 8;
-        if (enable)
-                tmp |= coremask;
-        else
-                tmp &= ~coremask;
-
-        err = pci_write_config_dword(pdev, BCMA_PCI_IRQMASK, tmp);
-
-out:
-        return err;
-}
-EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);
-
 static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
 {
         u32 w;
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index a62a2f9091f5..0856189c065f 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -351,3 +351,37 @@ void bcma_host_pci_down(struct bcma_bus *bus)
                 bcma_core_pci_down(&bus->drv_pci[0]);
 }
 EXPORT_SYMBOL_GPL(bcma_host_pci_down);
+
+/* See also si_pci_setup */
+int bcma_host_pci_irq_ctl(struct bcma_bus *bus, struct bcma_device *core,
+                          bool enable)
+{
+        struct pci_dev *pdev;
+        u32 coremask, tmp;
+        int err = 0;
+
+        if (bus->hosttype != BCMA_HOSTTYPE_PCI) {
+                /* This bcma device is not on a PCI host-bus. So the IRQs are
+                 * not routed through the PCI core.
+                 * So we must not enable routing through the PCI core. */
+                goto out;
+        }
+
+        pdev = bus->host_pci;
+
+        err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
+        if (err)
+                goto out;
+
+        coremask = BIT(core->core_index) << 8;
+        if (enable)
+                tmp |= coremask;
+        else
+                tmp &= ~coremask;
+
+        err = pci_write_config_dword(pdev, BCMA_PCI_IRQMASK, tmp);
+
+out:
+        return err;
+}
+EXPORT_SYMBOL_GPL(bcma_host_pci_irq_ctl);