wifi: mwifiex: pass adapter to mwifiex_dnld_cmd_to_fw()

priv is not needed in mwifiex_dnld_cmd_to_fw(), so pass the adapter to
it as context pointer.

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-5-a6bbd4ac4d37@pengutronix.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 1c8d69190be6518b8db91bbe588cd91c845f2622..1dca09646be27e62c3b59303fe1dcd490274f1cf 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -159,11 +159,9 @@ static int mwifiex_cmd_host_cmd(struct mwifiex_private *priv,
  * sending. Afterwards, it logs the command ID and action for debugging
  * and sets up the command timeout timer.
  */
-static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
+static int mwifiex_dnld_cmd_to_fw(struct mwifiex_adapter *adapter,
                                  struct cmd_ctrl_node *cmd_node)
 {
-
-       struct mwifiex_adapter *adapter = priv->adapter;
        int ret;
        struct host_cmd_ds_command *host_cmd;
        uint16_t cmd_code;
@@ -742,7 +740,6 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
  */
 int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)
 {
-       struct mwifiex_private *priv;
        struct cmd_ctrl_node *cmd_node;
        int ret = 0;
        struct host_cmd_ds_command *host_cmd;
@@ -766,7 +763,6 @@ int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)
                                    struct cmd_ctrl_node, list);
 
        host_cmd = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);
-       priv = cmd_node->priv;
 
        if (adapter->ps_state != PS_STATE_AWAKE) {
                mwifiex_dbg(adapter, ERROR,
@@ -781,7 +777,7 @@ int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)
        spin_unlock_bh(&adapter->cmd_pending_q_lock);
 
        spin_unlock_bh(&adapter->mwifiex_cmd_lock);
-       ret = mwifiex_dnld_cmd_to_fw(priv, cmd_node);
+       ret = mwifiex_dnld_cmd_to_fw(adapter, cmd_node);
 
        /* Any command sent to the firmware when host is in sleep
         * mode should de-configure host sleep. We should skip the