lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libertas: kill 'addtail' argument to lbs_queue_cmd() and make it static

Browse Source 
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Woodhouse
2007-12-15 20:04:54 -05:00
committed by David S. Miller
parent 2a345099a4
commit 681ffbb7d4
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/libertas/cmd.c
View File

@@ -1155,15 +1155,11 @@ static int lbs_cmd_bcn_ctrl(struct lbs_private * priv,
return 0; return 0;
} }
/* static void lbs_queue_cmd(struct lbs_private *priv,
* Note: NEVER use lbs_queue_cmd() with addtail==0 other than for struct cmd_ctrl_node *cmdnode)
* the command timer, because it does not account for queued commands.
*/
void lbs_queue_cmd(struct lbs_private *priv,
struct cmd_ctrl_node *cmdnode,
u8 addtail)
{ {
unsigned long flags; unsigned long flags;
int addtail = 1;
lbs_deb_enter(LBS_DEB_HOST); lbs_deb_enter(LBS_DEB_HOST);
@@ -1635,7 +1631,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
cmdnode->cmdwaitqwoken = 0; cmdnode->cmdwaitqwoken = 0;
lbs_queue_cmd(priv, cmdnode, 1); lbs_queue_cmd(priv, cmdnode);
wake_up_interruptible(&priv->waitq); wake_up_interruptible(&priv->waitq);
if (wait_option & CMD_OPTION_WAITFORRSP) { if (wait_option & CMD_OPTION_WAITFORRSP) {
@@ -2185,7 +2181,7 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, uint16_t command
* because the caller of lbs_cmd() sets up all of *cmd for us. */ * because the caller of lbs_cmd() sets up all of *cmd for us. */
cmdnode->cmdwaitqwoken = 0; cmdnode->cmdwaitqwoken = 0;
lbs_queue_cmd(priv, cmdnode, 1); lbs_queue_cmd(priv, cmdnode);
wake_up_interruptible(&priv->waitq); wake_up_interruptible(&priv->waitq);
done: done:

4
drivers/net/wireless/libertas/decl.h
View File

@@ -28,10 +28,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
u16 cmd_action, u16 cmd_action,
u16 wait_option, u32 cmd_oid, void *pdata_buf); u16 wait_option, u32 cmd_oid, void *pdata_buf);
void lbs_queue_cmd(struct lbs_private *priv,
struct cmd_ctrl_node *cmdnode,
u8 addtail);
int lbs_allocate_cmd_buffer(struct lbs_private *priv); int lbs_allocate_cmd_buffer(struct lbs_private *priv);
int lbs_execute_next_command(struct lbs_private *priv); int lbs_execute_next_command(struct lbs_private *priv);
int lbs_process_event(struct lbs_private *priv); int lbs_process_event(struct lbs_private *priv);