aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-11-30 03:18:06 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-21 18:55:52 -0500
commit7fa6282a1775bd41508220e65ba0cb92235b67d4 (patch)
treea9f9d784f497054b94873e42978007fe14dd6755 /drivers
parentb5a167942cb388cc5f1a6085cb3506d5bf47517d (diff)
wl1251: simplify ELP wakeup time calculation
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_ps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_ps.c b/drivers/net/wireless/wl12xx/wl1251_ps.c
index 54a27200f3b..851dfb65e47 100644
--- a/drivers/net/wireless/wl12xx/wl1251_ps.c
+++ b/drivers/net/wireless/wl12xx/wl1251_ps.c
@@ -68,7 +68,7 @@ void wl1251_ps_elp_sleep(struct wl1251 *wl)
68 68
69int wl1251_ps_elp_wakeup(struct wl1251 *wl) 69int wl1251_ps_elp_wakeup(struct wl1251 *wl)
70{ 70{
71 unsigned long timeout; 71 unsigned long timeout, start;
72 u32 elp_reg; 72 u32 elp_reg;
73 73
74 if (!wl->elp) 74 if (!wl->elp)
@@ -76,6 +76,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
76 76
77 wl1251_debug(DEBUG_PSM, "waking up chip from elp"); 77 wl1251_debug(DEBUG_PSM, "waking up chip from elp");
78 78
79 start = jiffies;
79 timeout = jiffies + msecs_to_jiffies(WL1251_WAKEUP_TIMEOUT); 80 timeout = jiffies + msecs_to_jiffies(WL1251_WAKEUP_TIMEOUT);
80 81
81 wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_WAKE_UP); 82 wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_WAKE_UP);
@@ -96,8 +97,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
96 } 97 }
97 98
98 wl1251_debug(DEBUG_PSM, "wakeup time: %u ms", 99 wl1251_debug(DEBUG_PSM, "wakeup time: %u ms",
99 jiffies_to_msecs(jiffies) - 100 jiffies_to_msecs(jiffies - start));
100 (jiffies_to_msecs(timeout) - WL1251_WAKEUP_TIMEOUT));
101 101
102 wl->elp = false; 102 wl->elp = false;
103 103