Skip to content

Commit

Permalink
brcm80211: fmac: move module entry points to dhd_linux.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Feb 22, 2012
1 parent 0a332e4 commit f3d7cdc
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -597,14 +597,14 @@ static struct sdio_driver brcmf_sdmmc_driver = {
#endif /* CONFIG_PM_SLEEP */
};

static void __exit brcmf_sdio_exit(void)
void brcmf_sdio_exit(void)
{
brcmf_dbg(TRACE, "Enter\n");

sdio_unregister_driver(&brcmf_sdmmc_driver);
}

static int __init brcmf_sdio_init(void)
int brcmf_sdio_init(void)
{
int ret;

Expand All @@ -617,6 +617,3 @@ static int __init brcmf_sdio_init(void)

return ret;
}

module_init(brcmf_sdio_init);
module_exit(brcmf_sdio_exit);
6 changes: 6 additions & 0 deletions drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,10 @@ extern int brcmf_bus_start(struct device *dev);

extern int brcmf_add_if(struct device *dev, int ifidx,
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_ */
24 changes: 24 additions & 0 deletions drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1183,3 +1183,27 @@ int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size)
return ret;
}
#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);

0 comments on commit f3d7cdc

Please sign in to comment.