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

mwl8k: remove mwl8k_queue_work()

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek
2009-08-18 04:08:01 +02:00
committed by John W. Linville
parent e6935ea104
commit ab565790cb
1 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/net/wireless/mwl8k.c
View File

@@ -2425,70 +2425,6 @@ static int mwl8k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
return rc; return rc;
} }
struct mwl8k_work_struct {
/* Initialized by mwl8k_queue_work(). */
struct work_struct wt;
/* Required field passed in to mwl8k_queue_work(). */
struct ieee80211_hw *hw;
/* Required field passed in to mwl8k_queue_work(). */
int (*wfunc)(struct work_struct *w);
/* Initialized by mwl8k_queue_work(). */
struct completion *cmd_wait;
/* Result code. */
int rc;
};
static void mwl8k_config_thread(struct work_struct *wt)
{
struct mwl8k_work_struct *worker = (struct mwl8k_work_struct *)wt;
struct ieee80211_hw *hw = worker->hw;
int rc = 0;
rc = mwl8k_fw_lock(hw);
if (!rc) {
rc = worker->wfunc(wt);
mwl8k_fw_unlock(hw);
}
worker->rc = rc;
complete(worker->cmd_wait);
}
static int mwl8k_queue_work(struct ieee80211_hw *hw,
struct mwl8k_work_struct *worker,
int (*wfunc)(struct work_struct *w))
{
struct mwl8k_priv *priv = hw->priv;
unsigned long timeout = 0;
int rc = 0;
DECLARE_COMPLETION_ONSTACK(cmd_wait);
worker->hw = hw;
worker->cmd_wait = &cmd_wait;
worker->rc = 1;
worker->wfunc = wfunc;
INIT_WORK(&worker->wt, mwl8k_config_thread);
queue_work(priv->config_wq, &worker->wt);
timeout = wait_for_completion_timeout(&cmd_wait,
msecs_to_jiffies(10000));
if (timeout)
rc = worker->rc;
else {
cancel_work_sync(&worker->wt);
rc = -ETIMEDOUT;
}
return rc;
}
static int mwl8k_start(struct ieee80211_hw *hw) static int mwl8k_start(struct ieee80211_hw *hw)
{ {
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;