android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mwifiex: don't open-code ARRAY_SIZE()

Browse Source 
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Brian Norris
2017-07-24 18:13:28 -07:00
committed by Kalle Valo
parent fe8d730ada
commit 8395fd9b19
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/marvell/mwifiex/cfp.c
View File

@ -180,11 +180,9 @@ static struct region_code_mapping region_code_mapping_t[] = {
u8 *mwifiex_11d_code_2_region(u8 code) u8 *mwifiex_11d_code_2_region(u8 code)
{ {
u8 i; u8 i;
u8 size = sizeof(region_code_mapping_t)/
sizeof(struct region_code_mapping);
/* Look for code in mapping table */ /* Look for code in mapping table */
for (i = 0; i < size; i++) for (i = 0; i < ARRAY_SIZE(region_code_mapping_t); i++)
if (region_code_mapping_t[i].code == code) if (region_code_mapping_t[i].code == code)
return region_code_mapping_t[i].region; return region_code_mapping_t[i].region;

8
drivers/net/wireless/marvell/mwifiex/sta_cmd.c
View File

@ -189,9 +189,7 @@ static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,
if (pbitmap_rates != NULL) { if (pbitmap_rates != NULL) {
rate_scope->hr_dsss_rate_bitmap = cpu_to_le16(pbitmap_rates[0]); rate_scope->hr_dsss_rate_bitmap = cpu_to_le16(pbitmap_rates[0]);
rate_scope->ofdm_rate_bitmap = cpu_to_le16(pbitmap_rates[1]); rate_scope->ofdm_rate_bitmap = cpu_to_le16(pbitmap_rates[1]);
for (i = 0; for (i = 0; i < ARRAY_SIZE(rate_scope->ht_mcs_rate_bitmap); i++)
i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(u16);
i++)
rate_scope->ht_mcs_rate_bitmap[i] = rate_scope->ht_mcs_rate_bitmap[i] =
cpu_to_le16(pbitmap_rates[2 + i]); cpu_to_le16(pbitmap_rates[2 + i]);
if (priv->adapter->fw_api_ver == MWIFIEX_FW_V15) { if (priv->adapter->fw_api_ver == MWIFIEX_FW_V15) {
@ -206,9 +204,7 @@ static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,
cpu_to_le16(priv->bitmap_rates[0]); cpu_to_le16(priv->bitmap_rates[0]);
rate_scope->ofdm_rate_bitmap = rate_scope->ofdm_rate_bitmap =
cpu_to_le16(priv->bitmap_rates[1]); cpu_to_le16(priv->bitmap_rates[1]);
for (i = 0; for (i = 0; i < ARRAY_SIZE(rate_scope->ht_mcs_rate_bitmap); i++)
i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(u16);
i++)
rate_scope->ht_mcs_rate_bitmap[i] = rate_scope->ht_mcs_rate_bitmap[i] =
cpu_to_le16(priv->bitmap_rates[2 + i]); cpu_to_le16(priv->bitmap_rates[2 + i]);
if (priv->adapter->fw_api_ver == MWIFIEX_FW_V15) { if (priv->adapter->fw_api_ver == MWIFIEX_FW_V15) {

5
drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
View File

@ -298,9 +298,8 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
priv->bitmap_rates[1] = priv->bitmap_rates[1] =
le16_to_cpu(rate_scope->ofdm_rate_bitmap); le16_to_cpu(rate_scope->ofdm_rate_bitmap);
for (i = 0; for (i = 0;
i < i < ARRAY_SIZE(rate_scope->ht_mcs_rate_bitmap);
sizeof(rate_scope->ht_mcs_rate_bitmap) / i++)
sizeof(u16); i++)
priv->bitmap_rates[2 + i] = priv->bitmap_rates[2 + i] =
le16_to_cpu(rate_scope-> le16_to_cpu(rate_scope->
ht_mcs_rate_bitmap[i]); ht_mcs_rate_bitmap[i]);