Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Franky Lin 2011-11-04 22:23:39 +01:00 committed by John W. Linville
parent 2bc78e10d8
commit a8a6c04586
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -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) static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
{ {
brcmf_dbg(TRACE, "Enter\n"); brcmf_dbg(TRACE, "Enter\n");
@ -3983,7 +3974,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
if (bus->ci) { if (bus->ci) {
brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false); brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
brcmf_sdbrcm_clkctl(bus, CLK_NONE, false); brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
brcmf_sdbrcm_chip_detach(bus); brcmf_sdio_chip_detach(&bus->ci);
if (bus->vars && bus->varsz) if (bus->vars && bus->varsz)
kfree(bus->vars); kfree(bus->vars);
bus->vars = NULL; bus->vars = NULL;

9
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
View File

@ -354,3 +354,12 @@ err:
kfree(ci); kfree(ci);
return ret; return ret;
} }
void
brcmf_sdio_chip_detach(struct chip_info **ci_ptr)
{
brcmf_dbg(TRACE, "Enter\n");
kfree(*ci_ptr);
*ci_ptr = NULL;
}

1
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
View File

@ -141,5 +141,6 @@ extern void brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev,
u32 corebase); u32 corebase);
extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev, extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,
struct chip_info **ci_ptr, u32 regs); struct chip_info **ci_ptr, u32 regs);
extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);
#endif /* _BRCMFMAC_SDIO_CHIP_H_ */ #endif /* _BRCMFMAC_SDIO_CHIP_H_ */