diff options
author | mike.rapoport@gmail.com <mike.rapoport@gmail.com> | 2010-10-13 00:09:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 12:29:56 -0700 |
commit | 182acb3ca59ba2d31485f7225177c069cebdc161 (patch) | |
tree | b0bd77c9c3c377d642c338bf825146f78a198b24 /drivers/staging/brcm80211/sys | |
parent | 199d217c52dcc961dfd5928e5cbc32cc8a9140d9 (diff) | |
download | op-kernel-dev-182acb3ca59ba2d31485f7225177c069cebdc161.zip op-kernel-dev-182acb3ca59ba2d31485f7225177c069cebdc161.tar.gz |
staging: brcm80211: replace MFREE with kfree
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.c | 18 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_alloc.c | 50 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.c | 5 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_antsel.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_channel.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_event.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 19 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_phy_shim.c | 2 |
9 files changed, 45 insertions, 61 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index 6f4e520..ff9cbcc 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -1582,9 +1582,9 @@ void wl_free(wl_info_t *wl) next = t->next; #ifdef BCMDBG if (t->name) - MFREE(wl->osh, t->name, strlen(t->name) + 1); + kfree(t->name); #endif - MFREE(wl->osh, t, sizeof(wl_timer_t)); + kfree(t); } osh = wl->osh; @@ -1668,7 +1668,7 @@ wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *task), if (!schedule_work(&task->work)) { WL_ERROR(("wl%d: schedule_work() failed\n", wl->pub->unit)); - MFREE(wl->osh, task, sizeof(wl_task_t)); + kfree(task); return -ENOMEM; } @@ -1984,9 +1984,9 @@ void wl_free_timer(wl_info_t *wl, wl_timer_t *t) wl->timers = wl->timers->next; #ifdef BCMDBG if (t->name) - MFREE(wl->osh, t->name, strlen(t->name) + 1); + kfree(t->name); #endif - MFREE(wl->osh, t, sizeof(wl_timer_t)); + kfree(t); return; } @@ -1997,9 +1997,9 @@ void wl_free_timer(wl_info_t *wl, wl_timer_t *t) tmp->next = t->next; #ifdef BCMDBG if (t->name) - MFREE(wl->osh, t->name, strlen(t->name) + 1); + kfree(t->name); #endif - MFREE(wl->osh, t, sizeof(wl_timer_t)); + kfree(t); return; } tmp = tmp->next; @@ -2199,7 +2199,7 @@ static void wl_rpcq_dispatch(struct wl_task *task) RPCQ_UNLOCK(wl, flags); - MFREE(wl->osh, task, sizeof(wl_task_t)); + kfree(task); atomic_dec(&wl->callbacks); } @@ -2259,7 +2259,7 @@ static void wl_timer_task(wl_task_t *task) wl_timer_t *t = (wl_timer_t *) task->context; _wl_timer(t); - MFREE(t->wl->osh, task, sizeof(wl_task_t)); + kfree(task); /* This dec is for the task_schedule. The timer related * callback is decremented in _wl_timer diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c index feb9a05..522f463 100644 --- a/drivers/staging/brcm80211/sys/wlc_alloc.c +++ b/drivers/staging/brcm80211/sys/wlc_alloc.c @@ -106,15 +106,13 @@ static void wlc_pub_mfree(osl_t *osh, wlc_pub_t *pub) return; if (pub->multicast) - MFREE(osh, pub->multicast, - (sizeof(struct ether_addr) * MAXMULTILIST)); - + kfree(pub->multicast); if (pub->tunables) { - MFREE(osh, pub->tunables, sizeof(wlc_tunables_t)); + kfree(pub->tunables); pub->tunables = NULL; } - MFREE(osh, pub, sizeof(wlc_pub_t)); + kfree(pub); } wlc_bsscfg_t *wlc_bsscfg_malloc(osl_t *osh, uint unit) @@ -143,22 +141,19 @@ void wlc_bsscfg_mfree(osl_t *osh, wlc_bsscfg_t *cfg) return; if (cfg->maclist) { - MFREE(osh, cfg->maclist, - (int)(offsetof(struct maclist, ea) + - cfg->nmac * ETHER_ADDR_LEN)); + kfree(cfg->maclist); cfg->maclist = NULL; } if (cfg->current_bss != NULL) { wlc_bss_info_t *current_bss = cfg->current_bss; if (current_bss->bcn_prb != NULL) - MFREE(osh, current_bss->bcn_prb, - current_bss->bcn_prb_len); - MFREE(osh, current_bss, sizeof(wlc_bss_info_t)); + kfree(current_bss->bcn_prb); + kfree(current_bss); cfg->current_bss = NULL; } - MFREE(osh, cfg, sizeof(wlc_bsscfg_t)); + kfree(cfg); } void wlc_bsscfg_ID_assign(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg) @@ -313,12 +308,12 @@ void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh) return; if (wlc->modulecb) { - MFREE(osh, wlc->modulecb, sizeof(modulecb_t) * WLC_MAXMODULES); + kfree(wlc->modulecb); wlc->modulecb = NULL; } if (wlc->default_bss) { - MFREE(osh, wlc->default_bss, sizeof(wlc_bss_info_t)); + kfree(wlc->default_bss); wlc->default_bss = NULL; } if (wlc->cfg) { @@ -327,36 +322,30 @@ void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh) } if (wlc->pkt_callback && wlc->pub && wlc->pub->tunables) { - MFREE(osh, - wlc->pkt_callback, - sizeof(pkt_cb_t) * (wlc->pub->tunables->maxpktcb + 1)); + kfree(wlc->pkt_callback); wlc->pkt_callback = NULL; } if (wlc->wsec_def_keys[0]) - MFREE(osh, wlc->wsec_def_keys[0], - (sizeof(wsec_key_t) * WLC_DEFAULT_KEYS)); - + kfree(wlc->wsec_def_keys[0]); if (wlc->protection) { - MFREE(osh, wlc->protection, sizeof(wlc_protection_t)); + kfree(wlc->protection); wlc->protection = NULL; } if (wlc->stf) { - MFREE(osh, wlc->stf, sizeof(wlc_stf_t)); + kfree(wlc->stf); wlc->stf = NULL; } if (wlc->bandstate[0]) - MFREE(osh, wlc->bandstate[0], (sizeof(wlcband_t) * MAXBANDS)); + kfree(wlc->bandstate[0]); if (wlc->corestate) { if (wlc->corestate->macstat_snapshot) { - MFREE(osh, wlc->corestate->macstat_snapshot, - sizeof(macstat_t)); - wlc->corestate->macstat_snapshot = NULL; + kfree(wlc->corestate->macstat_snapshot); wlc->corestate->macstat_snapshot = NULL; } - MFREE(osh, wlc->corestate, sizeof(wlccore_t)); + kfree(wlc->corestate); wlc->corestate = NULL; } @@ -369,18 +358,17 @@ void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh) if (wlc->hw) { #ifdef WLC_LOW if (wlc->hw->bandstate[0]) { - MFREE(osh, wlc->hw->bandstate[0], - (sizeof(wlc_hwband_t) * MAXBANDS)); + kfree(wlc->hw->bandstate[0]); wlc->hw->bandstate[0] = NULL; } #endif /* free hw struct */ - MFREE(osh, wlc->hw, sizeof(wlc_hw_info_t)); + kfree(wlc->hw); wlc->hw = NULL; } /* free the wlc */ - MFREE(osh, wlc, sizeof(wlc_info_t)); + kfree(wlc); wlc = NULL; } diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 552ddc0..1edc534 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -242,13 +242,12 @@ void wlc_ampdu_detach(ampdu_info_t *ampdu) /* free all ini's which were to be freed on callbacks which were never called */ for (i = 0; i < AMPDU_INI_FREE; i++) { if (ampdu->ini_free[i]) { - MFREE(ampdu->wlc->osh, ampdu->ini_free[i], - sizeof(scb_ampdu_tid_ini_t)); + kfree(ampdu->ini_free[i]); } } wlc_module_unregister(ampdu->wlc->pub, "ampdu", ampdu); - MFREE(ampdu->wlc->osh, ampdu, sizeof(ampdu_info_t)); + kfree(ampdu); } void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb) diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c index 55b8e1a..1f5e62a 100644 --- a/drivers/staging/brcm80211/sys/wlc_antsel.c +++ b/drivers/staging/brcm80211/sys/wlc_antsel.c @@ -158,7 +158,7 @@ void wlc_antsel_detach(antsel_info_t *asi) if (!asi) return; - MFREE(asi->pub->osh, asi, sizeof(antsel_info_t)); + kfree(asi); } void wlc_antsel_init(antsel_info_t *asi) diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 4d8768d..5f386d3 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -1106,7 +1106,7 @@ int wlc_bmac_detach(wlc_info_t *wlc) /* free vars */ if (wlc_hw->vars) { - MFREE(wlc_hw->osh, wlc_hw->vars, wlc_hw->vars_size); + kfree(wlc_hw->vars); wlc_hw->vars = NULL; } diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index 7dfd819..259f409 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c @@ -650,7 +650,7 @@ wlc_cm_info_t *wlc_channel_mgr_attach(wlc_info_t *wlc) void wlc_channel_mgr_detach(wlc_cm_info_t *wlc_cm) { if (wlc_cm) - MFREE(wlc_cm->pub->osh, wlc_cm, sizeof(wlc_cm_info_t)); + kfree(wlc_cm); } const char *wlc_channel_country_abbrev(wlc_cm_info_t *wlc_cm) diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c index 5ee0fd0..a2fdf48 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/sys/wlc_event.c @@ -71,7 +71,7 @@ wlc_eventq_t *wlc_eventq_attach(wlc_pub_t *pub, struct wlc_info *wlc, void *wl, if (!eq->timer) { WL_ERROR(("wl%d: wlc_eventq_attach: timer failed\n", pub->unit)); - MFREE(eq->pub->osh, eq, sizeof(wlc_eventq_t)); + kfree(eq); return NULL; } @@ -93,7 +93,7 @@ int wlc_eventq_detach(wlc_eventq_t *eq) } ASSERT(wlc_eventq_avail(eq) == false); - MFREE(eq->pub->osh, eq, sizeof(wlc_eventq_t)); + kfree(eq); return 0; } @@ -135,7 +135,7 @@ void wlc_event_free(wlc_eventq_t *eq, wlc_event_t *e) { ASSERT(e->data == NULL); ASSERT(e->next == NULL); - MFREE(eq->pub->osh, e, sizeof(wlc_event_t)); + kfree(e); } void wlc_eventq_enq(wlc_eventq_t *eq, wlc_event_t *e) diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 1c413ed..0f6497a 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -2248,8 +2248,7 @@ int wlc_bmac_detach(wlc_info_t *wlc) for (idx = 0; idx < MAXBANDS; idx++) if (wlc->bandstate[idx]->pi) { - osl_mfree(wlc->osh, wlc->bandstate[idx]->pi, - sizeof(wlc_phy_t)); + kfree(wlc->bandstate[idx]->pi); wlc->bandstate[idx]->pi = NULL; } @@ -2336,15 +2335,14 @@ uint wlc_detach(wlc_info_t *wlc) * references the wlc->hw->vars which is freed in wlc_bmac_detach() */ if (wlc->pub->vars) { - osl_mfree(wlc->osh, wlc->pub->vars, wlc->vars_size); + kfree(wlc->pub->vars); wlc->pub->vars = NULL; } #endif #ifdef BCMDBG if (wlc->country_ie_override) { - osl_mfree(wlc->osh, wlc->country_ie_override, - wlc->country_ie_override->len + TLV_HDR_LEN); + kfree(wlc->country_ie_override); wlc->country_ie_override = NULL; } #endif /* BCMDBG */ @@ -2355,7 +2353,7 @@ uint wlc_detach(wlc_info_t *wlc) prev = ptr = wlc->dumpcb_head; while (ptr) { ptr = prev->next; - osl_mfree(wlc->osh, prev, sizeof(dumpcb_t)); + kfree(prev); prev = ptr; } wlc->dumpcb_head = NULL; @@ -7190,10 +7188,9 @@ void wlc_bss_list_free(wlc_info_t *wlc, wlc_bss_list_t *bss_list) bi = bss_list->ptrs[index]; if (bi) { if (bi->bcn_prb) { - osl_mfree(wlc->osh, bi->bcn_prb, - bi->bcn_prb_len); + kfree(bi->bcn_prb); } - osl_mfree(wlc->osh, bi, sizeof(wlc_bss_info_t)); + kfree(bi); bss_list->ptrs[index] = NULL; } } @@ -8178,7 +8175,7 @@ static void wlc_process_eventq(void *arg) /* Perform OS specific event processing */ wl_event(wlc->wl, etmp->event.ifname, etmp); if (etmp->data) { - osl_mfree(wlc->osh, etmp->data, etmp->event.datalen); + kfree(etmp->data); etmp->data = NULL; } wlc_event_free(wlc->eventq, etmp); @@ -8676,5 +8673,5 @@ static void wlc_txq_free(wlc_info_t *wlc, osl_t *osh, wlc_txq_info_t *qi) p->next = p->next->next; } - osl_mfree(osh, qi, sizeof(wlc_txq_info_t)); + kfree(qi); } diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c index 57acd30..6980935 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c @@ -83,7 +83,7 @@ void wlc_phy_shim_detach(wlc_phy_shim_info_t *physhim) if (!physhim) return; - MFREE(physhim->wlc_hw->osh, physhim, sizeof(wlc_phy_shim_info_t)); + kfree(physhim); } struct wlapi_timer *wlapi_init_timer(wlc_phy_shim_info_t *physhim, |