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

Commit a8a6c045 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: move chip detach function to sdio_chip.c 



This patch is part of the abstracting chip backplane handle code
series.

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2bc78e10

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+1 −10
Original line number Diff line number Diff line
@@ -3967,15 +3967,6 @@ brcmf_sdbrcm_watchdog(unsigned long data) 
	}

}



static void

brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus)

{

	brcmf_dbg(TRACE, "Enter\n");



	kfree(bus->ci);

	bus->ci = NULL;

}



static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)

{

	brcmf_dbg(TRACE, "Enter\n");
@@ -3983,7 +3974,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus) 
	if (bus->ci) {

		brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);

		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);

		brcmf_sdbrcm_chip_detach(bus);

		brcmf_sdio_chip_detach(&bus->ci);

		if (bus->vars && bus->varsz)

			kfree(bus->vars);

		bus->vars = NULL;

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c

+9 −0
Original line number Diff line number Diff line
@@ -354,3 +354,12 @@ int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev, 
	kfree(ci);

	return ret;

}



void

brcmf_sdio_chip_detach(struct chip_info **ci_ptr)

{

	brcmf_dbg(TRACE, "Enter\n");



	kfree(*ci_ptr);

	*ci_ptr = NULL;

}

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h

+1 −0
Original line number Diff line number Diff line
@@ -141,5 +141,6 @@ extern void brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev, 
					u32 corebase);

extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

				  struct chip_info **ci_ptr, u32 regs);

extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);



#endif		/* _BRCMFMAC_SDIO_CHIP_H_ */