net: wireless: bcmdhd: delete dhd_common_deinit
Varun Wadekar [Mon, 16 Apr 2012 10:11:01 +0000 (15:11 +0530)]
Change-Id: I9a364d9eff931f373ae4547e82274637502958bf
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

drivers/net/wireless/bcmdhd/dhd.h
drivers/net/wireless/bcmdhd/dhd_common.c

index 71dd253..46e966d 100644 (file)
@@ -492,7 +492,6 @@ extern int dhd_wl_ioctl(dhd_pub_t *dhd_pub, int ifindex, wl_ioctl_t *ioc, void *
 extern int dhd_wl_ioctl_cmd(dhd_pub_t *dhd_pub, int cmd, void *arg, int len, uint8 set,
                             int ifindex);
 
-extern void dhd_common_deinit(dhd_pub_t *dhd_pub, dhd_cmn_t *sa_cmn);
 extern void dhd_common_init(osl_t *osh);
 
 extern int dhd_do_driver_init(struct net_device *net);
index 5cde69a..8be7717 100644 (file)
@@ -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