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

wl1251: simplify ELP wakeup time calculation

Browse Source 
The wakeup time calculation was too complicated, simplify it.

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Kalle Valo
2009-11-30 10:18:06 +02:00
committed by John W. Linville
parent b5a167942c
commit 7fa6282a17
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/wl12xx/wl1251_ps.c
View File

@@ -68,7 +68,7 @@ void wl1251_ps_elp_sleep(struct wl1251 *wl)
int wl1251_ps_elp_wakeup(struct wl1251 *wl) int wl1251_ps_elp_wakeup(struct wl1251 *wl)
{ {
unsigned long timeout; unsigned long timeout, start;
u32 elp_reg; u32 elp_reg;
if (!wl->elp) if (!wl->elp)
@@ -76,6 +76,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
wl1251_debug(DEBUG_PSM, "waking up chip from elp"); wl1251_debug(DEBUG_PSM, "waking up chip from elp");
start = jiffies;
timeout = jiffies + msecs_to_jiffies(WL1251_WAKEUP_TIMEOUT); timeout = jiffies + msecs_to_jiffies(WL1251_WAKEUP_TIMEOUT);
wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_WAKE_UP); wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_WAKE_UP);
@@ -96,8 +97,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
} }
wl1251_debug(DEBUG_PSM, "wakeup time: %u ms", wl1251_debug(DEBUG_PSM, "wakeup time: %u ms",
jiffies_to_msecs(jiffies) - jiffies_to_msecs(jiffies - start));
(jiffies_to_msecs(timeout) - WL1251_WAKEUP_TIMEOUT));
wl->elp = false; wl->elp = false;