openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wl12xx: don't check wow param on suspend/resume 

Since mac80211 calls suspend/resume only when wowlan triggers
exist, there is no need to check for triggers existance in the
callbacks as well.
Add a WARN_ON() to verify it.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller 2011-06-06 12:21:52 +03:00 committed by Luciano Coelho
parent 0c005048aa
commit 4a859df85a
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
drivers/net/wireless/wl12xx/main.c
View File

@ -1551,69 +1551,68 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
struct cfg80211_wowlan *wow) struct cfg80211_wowlan *wow)
{ {
struct wl1271 *wl = hw->priv; struct wl1271 *wl = hw->priv;
int ret;
wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow); wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
wl->wow_enabled = !!wow; WARN_ON(!wow || !wow->any);
if (wl->wow_enabled) {
int ret;
ret = wl1271_configure_suspend(wl);
if (ret < 0) {
wl1271_warning("couldn't prepare device to suspend");
return ret;
}
/* flush any remaining work */
wl1271_debug(DEBUG_MAC80211, "flushing remaining works");
flush_delayed_work(&wl->scan_complete_work);
/* wl->wow_enabled = true;
* disable and re-enable interrupts in order to flush ret = wl1271_configure_suspend(wl);
* the threaded_irq if (ret < 0) {
*/ wl1271_warning("couldn't prepare device to suspend");
wl1271_disable_interrupts(wl); return ret;
/*
* set suspended flag to avoid triggering a new threaded_irq
* work. no need for spinlock as interrupts are disabled.
*/
set_bit(WL1271_FLAG_SUSPENDED, &wl->flags);
wl1271_enable_interrupts(wl);
flush_work(&wl->tx_work);
flush_delayed_work(&wl->pspoll_work);
flush_delayed_work(&wl->elp_work);
} }
/* flush any remaining work */
wl1271_debug(DEBUG_MAC80211, "flushing remaining works");
flush_delayed_work(&wl->scan_complete_work);
/*
* disable and re-enable interrupts in order to flush
* the threaded_irq
*/
wl1271_disable_interrupts(wl);
/*
* set suspended flag to avoid triggering a new threaded_irq
* work. no need for spinlock as interrupts are disabled.
*/
set_bit(WL1271_FLAG_SUSPENDED, &wl->flags);
wl1271_enable_interrupts(wl);
flush_work(&wl->tx_work);
flush_delayed_work(&wl->pspoll_work);
flush_delayed_work(&wl->elp_work);
return 0; return 0;
} }
static int wl1271_op_resume(struct ieee80211_hw *hw) static int wl1271_op_resume(struct ieee80211_hw *hw)
{ {
struct wl1271 *wl = hw->priv; struct wl1271 *wl = hw->priv;
unsigned long flags;
bool run_irq_work = false;
wl1271_debug(DEBUG_MAC80211, "mac80211 resume wow=%d", wl1271_debug(DEBUG_MAC80211, "mac80211 resume wow=%d",
wl->wow_enabled); wl->wow_enabled);
WARN_ON(!wl->wow_enabled);
/* /*
* re-enable irq_work enqueuing, and call irq_work directly if * re-enable irq_work enqueuing, and call irq_work directly if
* there is a pending work. * there is a pending work.
*/ */
if (wl->wow_enabled) { spin_lock_irqsave(&wl->wl_lock, flags);
struct wl1271 *wl = hw->priv; clear_bit(WL1271_FLAG_SUSPENDED, &wl->flags);
unsigned long flags; if (test_and_clear_bit(WL1271_FLAG_PENDING_WORK, &wl->flags))
bool run_irq_work = false; run_irq_work = true;
spin_unlock_irqrestore(&wl->wl_lock, flags);
spin_lock_irqsave(&wl->wl_lock, flags); if (run_irq_work) {
clear_bit(WL1271_FLAG_SUSPENDED, &wl->flags); wl1271_debug(DEBUG_MAC80211,
if (test_and_clear_bit(WL1271_FLAG_PENDING_WORK, &wl->flags)) "run postponed irq_work directly");
run_irq_work = true; wl1271_irq(0, wl);
spin_unlock_irqrestore(&wl->wl_lock, flags); wl1271_enable_interrupts(wl);
if (run_irq_work) {
wl1271_debug(DEBUG_MAC80211,
"run postponed irq_work directly");
wl1271_irq(0, wl);
wl1271_enable_interrupts(wl);
}
wl1271_configure_resume(wl);
} }
wl1271_configure_resume(wl);
return 0; return 0;
} }