aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-14 23:08:13 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:07:28 -0500
commit8e5b6b2d32304f4d6a096a6dfae23d12dc6f9287 (patch)
tree2bcec84154fb42ca6b477d2e3342e999ab2a959e
parent7e226272fcf9c1ec8b67fac995ce4227f4f76971 (diff)
libertas: kill unused wait_option field in struct cmd_ctrl_node
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/cmd.c12
-rw-r--r--drivers/net/wireless/libertas/hostcmd.h2
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index ffef7212621e..5ceb331147f2 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -17,7 +17,7 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *ptempnode);
17static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv); 17static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv);
18static void lbs_set_cmd_ctrl_node(struct lbs_private *priv, 18static void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
19 struct cmd_ctrl_node *ptempnode, 19 struct cmd_ctrl_node *ptempnode,
20 u16 wait_option, void *pdata_buf); 20 void *pdata_buf);
21 21
22 22
23/** 23/**
@@ -1392,7 +1392,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
1392 goto done; 1392 goto done;
1393 } 1393 }
1394 1394
1395 lbs_set_cmd_ctrl_node(priv, cmdnode, wait_option, pdata_buf); 1395 lbs_set_cmd_ctrl_node(priv, cmdnode, pdata_buf);
1396 1396
1397 cmdptr = (struct cmd_ds_command *)cmdnode->cmdbuf; 1397 cmdptr = (struct cmd_ds_command *)cmdnode->cmdbuf;
1398 1398
@@ -1554,7 +1554,7 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
1554 case CMD_802_11_INACTIVITY_TIMEOUT: 1554 case CMD_802_11_INACTIVITY_TIMEOUT:
1555 ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr, 1555 ret = lbs_cmd_802_11_inactivity_timeout(priv, cmdptr,
1556 cmd_action, pdata_buf); 1556 cmd_action, pdata_buf);
1557 lbs_set_cmd_ctrl_node(priv, cmdnode, 0, pdata_buf); 1557 lbs_set_cmd_ctrl_node(priv, cmdnode, pdata_buf);
1558 break; 1558 break;
1559 1559
1560 case CMD_802_11_TPC_CFG: 1560 case CMD_802_11_TPC_CFG:
@@ -1800,7 +1800,6 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *cmdnode)
1800 return; 1800 return;
1801 cmdnode->cmdwaitqwoken = 1; 1801 cmdnode->cmdwaitqwoken = 1;
1802 wake_up_interruptible(&cmdnode->cmdwait_q); 1802 wake_up_interruptible(&cmdnode->cmdwait_q);
1803 cmdnode->wait_option = 0;
1804 cmdnode->pdata_buf = NULL; 1803 cmdnode->pdata_buf = NULL;
1805 cmdnode->callback = NULL; 1804 cmdnode->callback = NULL;
1806 cmdnode->callback_arg = 0; 1805 cmdnode->callback_arg = 0;
@@ -1816,20 +1815,18 @@ static void cleanup_cmdnode(struct cmd_ctrl_node *cmdnode)
1816 * 1815 *
1817 * @param priv A pointer to struct lbs_private structure 1816 * @param priv A pointer to struct lbs_private structure
1818 * @param ptempnode A pointer to cmd_ctrl_node structure 1817 * @param ptempnode A pointer to cmd_ctrl_node structure
1819 * @param wait_option wait option: wait response or not
1820 * @param pdata_buf A pointer to informaion buffer 1818 * @param pdata_buf A pointer to informaion buffer
1821 * @return 0 or -1 1819 * @return 0 or -1
1822 */ 1820 */
1823static void lbs_set_cmd_ctrl_node(struct lbs_private *priv, 1821static void lbs_set_cmd_ctrl_node(struct lbs_private *priv,
1824 struct cmd_ctrl_node *ptempnode, 1822 struct cmd_ctrl_node *ptempnode,
1825 u16 wait_option, void *pdata_buf) 1823 void *pdata_buf)
1826{ 1824{
1827 lbs_deb_enter(LBS_DEB_HOST); 1825 lbs_deb_enter(LBS_DEB_HOST);
1828 1826
1829 if (!ptempnode) 1827 if (!ptempnode)
1830 return; 1828 return;
1831 1829
1832 ptempnode->wait_option = wait_option;
1833 ptempnode->pdata_buf = pdata_buf; 1830 ptempnode->pdata_buf = pdata_buf;
1834 ptempnode->callback = NULL; 1831 ptempnode->callback = NULL;
1835 ptempnode->callback_arg = 0; 1832 ptempnode->callback_arg = 0;
@@ -2213,7 +2210,6 @@ int __lbs_cmd(struct lbs_private *priv, uint16_t command,
2213 goto done; 2210 goto done;
2214 } 2211 }
2215 2212
2216 cmdnode->wait_option = CMD_OPTION_WAITFORRSP;
2217 cmdnode->callback = callback; 2213 cmdnode->callback = callback;
2218 cmdnode->callback_arg = callback_arg; 2214 cmdnode->callback_arg = callback_arg;
2219 2215
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index aa4cea040143..1b31250fdab2 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -74,8 +74,6 @@ struct cmd_header {
74 74
75struct cmd_ctrl_node { 75struct cmd_ctrl_node {
76 struct list_head list; 76 struct list_head list;
77 /* wait for finish or not */
78 u16 wait_option;
79 /* command response */ 77 /* command response */
80 void *pdata_buf; 78 void *pdata_buf;
81 int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *); 79 int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *);