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

Commit b30ee754 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: remove ai_pci_setup() 



This is now done by calling bcma_core_pci_irq_ctl()

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Tested-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63286295

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

+0 −23
Original line number Diff line number Diff line
@@ -842,29 +842,6 @@ void ai_pci_down(struct si_pub *sih) 
	pcicore_down(sii->pch, SI_PCIDOWN);

}



/*

 * Configure the pci core for pci client (NIC) action

 * coremask is the bitvec of cores by index to be enabled.

 */

void ai_pci_setup(struct si_pub *sih, uint coremask)

{

	struct si_info *sii;

	u32 w;



	sii = (struct si_info *)sih;



	/*

	 * Enable sb->pci interrupts.  Assume

	 * PCI rev 2.3 support was added in pci core rev 6 and things changed..

	 */

	if (PCIE(sih)) {

		/* pci config write to set this core bit in PCIIntMask */

		pci_read_config_dword(sii->pcibus, PCI_INT_MASK, &w);

		w |= (coremask << PCI_SBIM_SHIFT);

		pci_write_config_dword(sii->pcibus, PCI_INT_MASK, w);

	}

}



/*

 * Fixup SROMless PCI device's configuration.

 * The current core may be changed upon return.

drivers/net/wireless/brcm80211/brcmsmac/aiutils.h

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ extern u32 ai_core_cflags(struct bcma_device *core, u32 mask, u32 val); 
extern struct si_pub *ai_attach(struct bcma_bus *pbus);

extern void ai_detach(struct si_pub *sih);

extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);

extern void ai_pci_setup(struct si_pub *sih, uint coremask);

extern void ai_clkctl_init(struct si_pub *sih);

extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);

extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);

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

+2 −5
Original line number Diff line number Diff line
@@ -5050,8 +5050,6 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw) 


static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)

{

	uint coremask;



	BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);



	/*
@@ -5066,9 +5064,8 @@ 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.

	 */

	coremask = (1 << wlc_hw->wlc->core->coreidx);



	ai_pci_setup(wlc_hw->sih, coremask);

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

			      true);



	/*

	 * Need to read the hwradio status here to cover the case where the