Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b6ff664 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

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: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4186721d

drivers/bcma/driver_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -282,21 +282,21 @@ 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_drv_pci *pc, struct bcma_device *core,

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 (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {

	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 = pc->core->bus->host_pci;

	pdev = bus->host_pci;



	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);

	if (err)

drivers/net/wireless/b43/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4866,7 +4866,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev) 
	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],

		bcma_core_pci_irq_ctl(dev->dev->bdev->bus,

				      dev->dev->bdev, true);

		bcma_host_pci_up(dev->dev->bdev->bus);

		break;

drivers/net/wireless/brcm80211/brcmsmac/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4959,7 +4959,7 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw) 
	 * Configure pci/pcmcia here instead of in brcms_c_attach()

	 * to allow mfg hotswap:  down, hotswap (chip power cycle), up.

	 */

	bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci[0], wlc_hw->d11core,

	bcma_core_pci_irq_ctl(wlc_hw->d11core->bus, wlc_hw->d11core,

			      true);



	/*

include/linux/bcma/bcma_driver_pci.h

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct bcma_drv_pci { 


extern void bcma_core_pci_early_init(struct bcma_drv_pci *pc);

extern void bcma_core_pci_init(struct bcma_drv_pci *pc);

extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,

extern int bcma_core_pci_irq_ctl(struct bcma_bus *bus,

				 struct bcma_device *core, bool enable);

extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);