lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

brcm80211: fmac: move module entry points to dhd_linux.c

Browse Source 
The module_init/exit functions are moved to dhd_linux.c to prepare
for supporting multiple host interface types.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Franky (Zhenhui) 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:
Arend van Spriel
2012-02-09 21:09:03 +01:00
committed by John W. Linville
parent 0a332e4678
commit f3d7cdc3b4
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View File

@@ -597,14 +597,14 @@ static struct sdio_driver brcmf_sdmmc_driver = {
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
}; };
static void __exit brcmf_sdio_exit(void) void brcmf_sdio_exit(void)
{ {
brcmf_dbg(TRACE, "Enter\n"); brcmf_dbg(TRACE, "Enter\n");
sdio_unregister_driver(&brcmf_sdmmc_driver); sdio_unregister_driver(&brcmf_sdmmc_driver);
} }
static int __init brcmf_sdio_init(void) int brcmf_sdio_init(void)
{ {
int ret; int ret;
@@ -617,6 +617,3 @@ static int __init brcmf_sdio_init(void)
return ret; return ret;
} }
module_init(brcmf_sdio_init);
module_exit(brcmf_sdio_exit);

6
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
View File

@@ -105,4 +105,10 @@ extern int brcmf_bus_start(struct device *dev);
extern int brcmf_add_if(struct device *dev, int ifidx, extern int brcmf_add_if(struct device *dev, int ifidx,
char *name, u8 *mac_addr); char *name, u8 *mac_addr);
#ifdef CONFIG_BRCMFMAC_SDIO
extern void brcmf_sdio_exit(void);
extern int brcmf_sdio_init(void);
#endif
#endif /* _BRCMF_BUS_H_ */ #endif /* _BRCMF_BUS_H_ */

24
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View File

@@ -1183,3 +1183,27 @@ exit:
return ret; return ret;
} }
#endif /* DEBUG */ #endif /* DEBUG */
static int __init brcmfmac_init(void)
{
int ret = 0;
#ifdef CONFIG_BRCMFMAC_SDIO
ret = brcmf_sdio_init();
if (ret)
goto fail;
#endif
fail:
return ret;
}
static void __exit brcmfmac_exit(void)
{
#ifdef CONFIG_BRCMFMAC_SDIO
brcmf_sdio_exit();
#endif
}
module_init(brcmfmac_init);
module_exit(brcmfmac_exit);