wifi: mwifiex: deduplicate code in mwifiex_cmd_tx_rate_cfg()

The code block inside the if/else is the same with just using
pbitmap_rates if non NULL or priv->bitmap_rates otherwise. Deduplicate
the code by picking the correct pointer first and then using it
unconditionally.

Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Brian Norris <briannorris@chromium.org>
Link: https://patch.msgid.link/20250410-mwifiex-cleanup-1-v6-1-a6bbd4ac4d37@pengutronix.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index c4689f5a1acc8ee63b1dca74792742131f1b341d..f2e9f582ae818e17b7825b31000078f5b400514a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -157,7 +157,7 @@ mwifiex_cmd_802_11_get_log(struct host_cmd_ds_command *cmd)
  */
 static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,
                                   struct host_cmd_ds_command *cmd,
-                                  u16 cmd_action, u16 *pbitmap_rates)
+                                  u16 cmd_action, const u16 *pbitmap_rates)
 {
        struct host_cmd_ds_tx_rate_cfg *rate_cfg = &cmd->params.tx_rate_cfg;
        struct mwifiex_rate_scope *rate_scope;
@@ -174,34 +174,19 @@ static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,
        rate_scope->type = cpu_to_le16(TLV_TYPE_RATE_SCOPE);
        rate_scope->length = cpu_to_le16
                (sizeof(*rate_scope) - sizeof(struct mwifiex_ie_types_header));
-       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 < 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) {
-                       for (i = 0;
-                            i < ARRAY_SIZE(rate_scope->vht_mcs_rate_bitmap);
-                            i++)
-                               rate_scope->vht_mcs_rate_bitmap[i] =
-                                       cpu_to_le16(pbitmap_rates[10 + i]);
-               }
-       } else {
-               rate_scope->hr_dsss_rate_bitmap =
-                       cpu_to_le16(priv->bitmap_rates[0]);
-               rate_scope->ofdm_rate_bitmap =
-                       cpu_to_le16(priv->bitmap_rates[1]);
-               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) {
-                       for (i = 0;
-                            i < ARRAY_SIZE(rate_scope->vht_mcs_rate_bitmap);
-                            i++)
-                               rate_scope->vht_mcs_rate_bitmap[i] =
-                                       cpu_to_le16(priv->bitmap_rates[10 + i]);
-               }
+       if (!pbitmap_rates)
+               pbitmap_rates = priv->bitmap_rates;
+
+       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 < 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) {
+               for (i = 0; i < ARRAY_SIZE(rate_scope->vht_mcs_rate_bitmap); i++)
+                       rate_scope->vht_mcs_rate_bitmap[i] =
+                               cpu_to_le16(pbitmap_rates[10 + i]);
        }
 
        rate_drop = (struct mwifiex_rate_drop_pattern *) ((u8 *) rate_scope +