Commit 85abfb12 authored by Andreas Fenkart's avatar Andreas Fenkart Committed by Kalle Valo
Browse files

mwifiex: make mwifiex_insert_cmd_to_free_q local static 



after factoring out mwifiex_cancel_pending_scan_cmd
the function is not called outside of cmdevt file
moved function to head of file to avoid forward declaration,
also moved mwifiex_recycle_cmd_node since they are very similar

Signed-off-by: default avatarAndreas Fenkart <afenkart@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c70ca8cb

drivers/net/wireless/marvell/mwifiex/cmdevt.c

+41 −41
Original line number Diff line number Diff line
@@ -104,6 +104,47 @@ mwifiex_clean_cmd_node(struct mwifiex_adapter *adapter, 
	}

}



/*

 * This function returns a command to the command free queue.

 *

 * The function also calls the completion callback if required, before

 * cleaning the command node and re-inserting it into the free queue.

 */

static void

mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,

			     struct cmd_ctrl_node *cmd_node)

{

	unsigned long flags;



	if (!cmd_node)

		return;



	if (cmd_node->wait_q_enabled)

		mwifiex_complete_cmd(adapter, cmd_node);

	/* Clean the node */

	mwifiex_clean_cmd_node(adapter, cmd_node);



	/* Insert node into cmd_free_q */

	spin_lock_irqsave(&adapter->cmd_free_q_lock, flags);

	list_add_tail(&cmd_node->list, &adapter->cmd_free_q);

	spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags);

}



/* This function reuses a command node. */

void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,

			      struct cmd_ctrl_node *cmd_node)

{

	struct host_cmd_ds_command *host_cmd = (void *)cmd_node->cmd_skb->data;



	mwifiex_insert_cmd_to_free_q(adapter, cmd_node);



	atomic_dec(&adapter->cmd_pending);

	mwifiex_dbg(adapter, CMD,

		    "cmd: FREE_CMD: cmd=%#x, cmd_pending=%d\n",

		le16_to_cpu(host_cmd->command),

		atomic_read(&adapter->cmd_pending));

}



/*

 * This function sends a host command to the firmware.

 *
@@ -613,47 +654,6 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no, 
	return ret;

}



/*

 * This function returns a command to the command free queue.

 *

 * The function also calls the completion callback if required, before

 * cleaning the command node and re-inserting it into the free queue.

 */

void

mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,

			     struct cmd_ctrl_node *cmd_node)

{

	unsigned long flags;



	if (!cmd_node)

		return;



	if (cmd_node->wait_q_enabled)

		mwifiex_complete_cmd(adapter, cmd_node);

	/* Clean the node */

	mwifiex_clean_cmd_node(adapter, cmd_node);



	/* Insert node into cmd_free_q */

	spin_lock_irqsave(&adapter->cmd_free_q_lock, flags);

	list_add_tail(&cmd_node->list, &adapter->cmd_free_q);

	spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags);

}



/* This function reuses a command node. */

void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,

			      struct cmd_ctrl_node *cmd_node)

{

	struct host_cmd_ds_command *host_cmd = (void *)cmd_node->cmd_skb->data;



	mwifiex_insert_cmd_to_free_q(adapter, cmd_node);



	atomic_dec(&adapter->cmd_pending);

	mwifiex_dbg(adapter, CMD,

		    "cmd: FREE_CMD: cmd=%#x, cmd_pending=%d\n",

		le16_to_cpu(host_cmd->command),

		atomic_read(&adapter->cmd_pending));

}



/*

 * This function queues a command to the command pending queue.

 *

drivers/net/wireless/marvell/mwifiex/main.h

+0 −2
Original line number Diff line number Diff line
@@ -1044,8 +1044,6 @@ void mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter); 
void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter);

void mwifiex_cancel_pending_scan_cmd(struct mwifiex_adapter *adapter);



void mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,

				  struct cmd_ctrl_node *cmd_node);

void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,

			      struct cmd_ctrl_node *cmd_node);

CRA Git | Maintained and supported by SUSTech CRA and CCSE