diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-16 15:41:01 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-16 15:41:33 +0530 |
| commit | 040d8b693307598ca6af82a4e5d9bd97a5742228 (patch) | |
| tree | ee06f8b087f5eb115a81f5f12ae159d6792eb6a5 /drivers/net/wireless/bcmdhd/dhd_common.c | |
| parent | e8f6f41055a98446bec1065db17c4c27da86fee6 (diff) | |
net: wireless: bcmdhd: delete dhd_common_deinit
Change-Id: I9a364d9eff931f373ae4547e82274637502958bf
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_common.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index 5cde69aba426..8be77178999e 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -187,14 +187,14 @@ dhd_common_init(osl_t *osh) #ifdef CONFIG_BCMDHD_FW_PATH bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCMDHD_FW_PATH, MOD_PARAM_PATHLEN-1); #elif defined(CONFIG_BCMDHD_FW_DIR) /* CONFIG_BCMDHD_FW_PATH */ - sprintf(fw_path, "%s/bcm%x/fw_bcmdhd.bin", CONFIG_BCMDHD_FW_DIR, devid); + sprintf(fw_path, "%s/bcm%x/fw_bcmdhd.bin", CONFIG_BCMDHD_FW_DIR, MOD_PARAM_PATHLEN-1); #else fw_path[0] = '\0'; #endif /* CONFIG_BCMDHD_FW_DIR */ #ifdef CONFIG_BCMDHD_NVRAM_PATH bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCMDHD_NVRAM_PATH, MOD_PARAM_PATHLEN-1); #elif defined(CONFIG_BCMDHD_NVRAM_DIR) /* CONFIG_BCMDHD_NVRAM_PATH */ - sprintf(nv_path, "%s/nvram_%x.txt", CONFIG_BCMDHD_NVRAM_DIR, devid); + sprintf(nv_path, "%s/nvram_%x.txt", CONFIG_BCMDHD_NVRAM_DIR, MOD_PARAM_PATHLEN-1); #else nv_path[0] = '\0'; #endif /* CONFIG_BCMDHD_NVRAM_PATH */ @@ -202,28 +202,6 @@ dhd_common_init(osl_t *osh) fw_path2[0] = '\0'; #endif DHD_ERROR(("bcmdhd: fw_path: %s nvram_path: %s\n", fw_path, nv_path)); - return cmn; -} - -void -dhd_common_deinit(dhd_pub_t *dhd_pub, dhd_cmn_t *sa_cmn) -{ - osl_t *osh; - dhd_cmn_t *cmn; - - if (dhd_pub != NULL) - cmn = dhd_pub->cmn; - else - cmn = sa_cmn; - - if (!cmn) - return; - - osh = cmn->osh; - - if (dhd_pub != NULL) - dhd_pub->cmn = NULL; - MFREE(osh, cmn, sizeof(dhd_cmn_t)); } static int |