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/phy | |
| parent | 199d217c52dcc961dfd5928e5cbc32cc8a9140d9 (diff) | |
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/phy')
| -rw-r--r-- | drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 6 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 10 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/phy/wlc_phy_n.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c index b6acaa003a13..21bb8f10fc10 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c @@ -599,7 +599,7 @@ void wlc_phy_shared_detach(shared_phy_t *phy_sh) if (phy_sh->phy_head) { ASSERT(!phy_sh->phy_head); } - MFREE(osh, phy_sh, sizeof(shared_phy_t)); + kfree(phy_sh); } } @@ -780,7 +780,7 @@ wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars err: if (pi) - MFREE(sh->osh, pi, sizeof(phy_info_t)); + kfree(pi); return NULL; } @@ -808,7 +808,7 @@ void wlc_phy_detach(wlc_phy_t *pih) if (pi->pi_fptr.detach) (pi->pi_fptr.detach) (pi); - MFREE(pi->sh->osh, pi, sizeof(phy_info_t)); + kfree(pi); } } diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c index 07ae123b12c7..c41db98ddcce 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c @@ -2061,7 +2061,7 @@ wlc_lcnphy_tx_iqlo_cal(phy_info_t *pi, cleanup: wlc_lcnphy_tx_iqlo_loopback_cleanup(pi, values_to_save); - MFREE(pi->sh->osh, values_to_save, 20 * sizeof(u16)); + kfree(values_to_save); if (!keep_tone) wlc_lcnphy_stop_tx_tone(pi); @@ -3437,7 +3437,7 @@ wlc_lcnphy_rx_iq_cal(phy_info_t *pi, const lcnphy_rx_iqcomp_t *iqcomp, } cal_done: - MFREE(pi->sh->osh, ptr, 131 * sizeof(s16)); + kfree(ptr); return result; } @@ -4212,8 +4212,8 @@ wlc_lcnphy_a1(phy_info_t *pi, int cal_type, int num_levels, int step_size_lg2) write_phy_reg(pi, 0x4d8, phy_c30); write_radio_reg(pi, RADIO_2064_REG026, phy_c31); - MFREE(pi->sh->osh, phy_c32, 20 * sizeof(u16)); - MFREE(pi->sh->osh, ptr, 131 * sizeof(s16)); + kfree(phy_c32); + kfree(ptr); } static void @@ -5047,7 +5047,7 @@ void wlc_phy_txpower_recalc_target_lcnphy(phy_info_t *pi) void wlc_phy_detach_lcnphy(phy_info_t *pi) { - MFREE(pi->sh->osh, pi->u.pi_lcnphy, sizeof(phy_info_lcnphy_t)); + kfree(pi->u.pi_lcnphy); } bool wlc_phy_attach_lcnphy(phy_info_t *pi) diff --git a/drivers/staging/brcm80211/phy/wlc_phy_n.c b/drivers/staging/brcm80211/phy/wlc_phy_n.c index 27bb3499cc87..6e3dbfd7815c 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_n.c +++ b/drivers/staging/brcm80211/phy/wlc_phy_n.c @@ -22382,7 +22382,7 @@ wlc_phy_gen_load_samples_nphy(phy_info_t *pi, u32 f_kHz, u16 max_val, wlc_phy_loadsampletable_nphy(pi, tone_buf, num_samps); if (tone_buf != NULL) - MFREE(pi->sh->osh, tone_buf, sizeof(cs32) * tbl_len); + kfree(tone_buf); return num_samps; } @@ -22430,7 +22430,7 @@ wlc_phy_loadsampletable_nphy(phy_info_t *pi, cs32 *tone_buf, data_buf); if (data_buf != NULL) - MFREE(pi->sh->osh, data_buf, sizeof(u32) * num_samps); + kfree(data_buf); if (pi->phyhang_avoid) wlc_phy_stay_in_carriersearch_nphy(pi, false); @@ -26768,7 +26768,7 @@ wlc_phy_a1_nphy(phy_info_t *pi, u8 core, u32 winsz, u32 start, PHY_CORE_0) ? NPHY_TBL_ID_EPSILONTBL0 : NPHY_TBL_ID_EPSILONTBL1, sz, start, 32, dst); - MFREE(pi->sh->osh, buf, 2 * sizeof(u32) * NPHY_PAPD_EPS_TBL_SIZE); + kfree(buf); } static void |