Commit 3ffd23d1 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo

wifi: mwifiex: cleanup struct mwifiex_sdio_mpa_rx

Drop filled with NULL pointers but otherwise unused 'skb_arr'
array of 'struct mwifiex_sdio_mpa_rx', adjust related code.
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230821115254.167552-1-dmantipov@yandex.ru
parent 74f7957c
...@@ -2555,20 +2555,11 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter) ...@@ -2555,20 +2555,11 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
if (!card->mp_regs) if (!card->mp_regs)
return -ENOMEM; return -ENOMEM;
/* Allocate skb pointer buffers */
card->mpa_rx.skb_arr = kcalloc(card->mp_agg_pkt_limit, sizeof(void *),
GFP_KERNEL);
if (!card->mpa_rx.skb_arr) {
kfree(card->mp_regs);
return -ENOMEM;
}
card->mpa_rx.len_arr = kcalloc(card->mp_agg_pkt_limit, card->mpa_rx.len_arr = kcalloc(card->mp_agg_pkt_limit,
sizeof(*card->mpa_rx.len_arr), sizeof(*card->mpa_rx.len_arr),
GFP_KERNEL); GFP_KERNEL);
if (!card->mpa_rx.len_arr) { if (!card->mpa_rx.len_arr) {
kfree(card->mp_regs); kfree(card->mp_regs);
kfree(card->mpa_rx.skb_arr);
return -ENOMEM; return -ENOMEM;
} }
...@@ -2623,7 +2614,6 @@ static void mwifiex_cleanup_sdio(struct mwifiex_adapter *adapter) ...@@ -2623,7 +2614,6 @@ static void mwifiex_cleanup_sdio(struct mwifiex_adapter *adapter)
cancel_work_sync(&card->work); cancel_work_sync(&card->work);
kfree(card->mp_regs); kfree(card->mp_regs);
kfree(card->mpa_rx.skb_arr);
kfree(card->mpa_rx.len_arr); kfree(card->mpa_rx.len_arr);
kfree(card->mpa_tx.buf); kfree(card->mpa_tx.buf);
kfree(card->mpa_rx.buf); kfree(card->mpa_rx.buf);
......
...@@ -164,10 +164,7 @@ struct mwifiex_sdio_mpa_rx { ...@@ -164,10 +164,7 @@ struct mwifiex_sdio_mpa_rx {
u32 pkt_cnt; u32 pkt_cnt;
u32 ports; u32 ports;
u16 start_port; u16 start_port;
struct sk_buff **skb_arr;
u32 *len_arr; u32 *len_arr;
u8 enabled; u8 enabled;
u32 buf_size; u32 buf_size;
u32 pkt_aggr_limit; u32 pkt_aggr_limit;
...@@ -372,7 +369,6 @@ static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card, ...@@ -372,7 +369,6 @@ static inline void mp_rx_aggr_setup(struct sdio_mmc_card *card,
else else
card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt + 1); card->mpa_rx.ports |= 1 << (card->mpa_rx.pkt_cnt + 1);
} }
card->mpa_rx.skb_arr[card->mpa_rx.pkt_cnt] = NULL;
card->mpa_rx.len_arr[card->mpa_rx.pkt_cnt] = rx_len; card->mpa_rx.len_arr[card->mpa_rx.pkt_cnt] = rx_len;
card->mpa_rx.pkt_cnt++; card->mpa_rx.pkt_cnt++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment