mwifiex: don't open-code ARRAY_SIZE()

Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfp.c b/drivers/net/wireless/marvell/mwifiex/cfp.c
index 6e29943..bfe84e5 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfp.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfp.c
@@ -180,11 +180,9 @@ static struct region_code_mapping region_code_mapping_t[] = {
 u8 *mwifiex_11d_code_2_region(u8 code)
 {
        u8 i;
-       u8 size = sizeof(region_code_mapping_t)/
-                               sizeof(struct region_code_mapping);
 
        /* 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)
                        return region_code_mapping_t[i].region;
 

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 534d94a..b71ad4d 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -189,9 +189,7 @@ static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,
        if (pbitmap_rates != NULL) {
                rate_scope->hr_dsss_rate_bitmap = cpu_to_le16(pbitmap_rates[0]);
                rate_scope->ofdm_rate_bitmap = cpu_to_le16(pbitmap_rates[1]);
-               for (i = 0;
-                    i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(u16);
-                    i++)
+               for (i = 0; i < ARRAY_SIZE(rate_scope->ht_mcs_rate_bitmap); i++)
                        rate_scope->ht_mcs_rate_bitmap[i] =
                                cpu_to_le16(pbitmap_rates[2 + i]);
                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]);
                rate_scope->ofdm_rate_bitmap =
                        cpu_to_le16(priv->bitmap_rates[1]);
-               for (i = 0;
-                    i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(u16);
-                    i++)
+               for (i = 0; i < ARRAY_SIZE(rate_scope->ht_mcs_rate_bitmap); i++)
                        rate_scope->ht_mcs_rate_bitmap[i] =
                                cpu_to_le16(priv->bitmap_rates[2 + i]);
                if (priv->adapter->fw_api_ver == MWIFIEX_FW_V15) {

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 2945775..0fba5b1 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -298,9 +298,8 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
                        priv->bitmap_rates[1] =
                                le16_to_cpu(rate_scope->ofdm_rate_bitmap);
                        for (i = 0;
-                            i <
-                            sizeof(rate_scope->ht_mcs_rate_bitmap) /
-                            sizeof(u16); i++)
+                            i < ARRAY_SIZE(rate_scope->ht_mcs_rate_bitmap);
+                            i++)
                                priv->bitmap_rates[2 + i] =
                                        le16_to_cpu(rate_scope->
                                                    ht_mcs_rate_bitmap[i]);