diff options
author | Eyal Shapira <eyal@wizery.com> | 2012-01-31 04:57:23 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-02-15 01:38:32 -0500 |
commit | 248a0018f365c1fa51aa381e7b6f6e97eacf61ff (patch) | |
tree | abb3dc532049678cf7df05ef4778fd380b7e1b65 | |
parent | 1faff895df6a5213ee16a241951dc79c7ec5b5cb (diff) |
wl12xx: remove 2 unused parameters in wl1271_ps_set_mode()
cleanup 2 unused parameters of wl1271_ps_set_mode
Signed-off-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/debugfs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/ps.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/ps.h | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c index 156a7741df34..4436851a4fa7 100644 --- a/drivers/net/wireless/wl12xx/debugfs.c +++ b/drivers/net/wireless/wl12xx/debugfs.c | |||
@@ -359,9 +359,7 @@ static ssize_t dynamic_ps_timeout_write(struct file *file, | |||
359 | 359 | ||
360 | wl12xx_for_each_wlvif_sta(wl, wlvif) { | 360 | wl12xx_for_each_wlvif_sta(wl, wlvif) { |
361 | if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) | 361 | if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) |
362 | wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE, | 362 | wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE); |
363 | wlvif->basic_rate, true); | ||
364 | |||
365 | } | 363 | } |
366 | 364 | ||
367 | wl1271_ps_elp_sleep(wl); | 365 | wl1271_ps_elp_sleep(wl); |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 6b240868ac75..97f7591c3b39 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -2472,8 +2472,7 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, | |||
2472 | if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) { | 2472 | if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) { |
2473 | wl1271_debug(DEBUG_PSM, "psm enabled"); | 2473 | wl1271_debug(DEBUG_PSM, "psm enabled"); |
2474 | ret = wl1271_ps_set_mode(wl, wlvif, | 2474 | ret = wl1271_ps_set_mode(wl, wlvif, |
2475 | STATION_POWER_SAVE_MODE, | 2475 | STATION_AUTO_PS_MODE); |
2476 | wlvif->basic_rate, true); | ||
2477 | } | 2476 | } |
2478 | } else if (!(conf->flags & IEEE80211_CONF_PS) && | 2477 | } else if (!(conf->flags & IEEE80211_CONF_PS) && |
2479 | test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) { | 2478 | test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) { |
@@ -2483,8 +2482,7 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, | |||
2483 | 2482 | ||
2484 | if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) | 2483 | if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) |
2485 | ret = wl1271_ps_set_mode(wl, wlvif, | 2484 | ret = wl1271_ps_set_mode(wl, wlvif, |
2486 | STATION_ACTIVE_MODE, | 2485 | STATION_ACTIVE_MODE); |
2487 | wlvif->basic_rate, true); | ||
2488 | } | 2486 | } |
2489 | 2487 | ||
2490 | if (conf->power_level != wlvif->power_level) { | 2488 | if (conf->power_level != wlvif->power_level) { |
@@ -3824,9 +3822,7 @@ sta_not_found: | |||
3824 | !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { | 3822 | !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { |
3825 | 3823 | ||
3826 | ret = wl1271_ps_set_mode(wl, wlvif, | 3824 | ret = wl1271_ps_set_mode(wl, wlvif, |
3827 | STATION_AUTO_PS_MODE, | 3825 | STATION_AUTO_PS_MODE); |
3828 | wlvif->basic_rate, | ||
3829 | true); | ||
3830 | if (ret < 0) | 3826 | if (ret < 0) |
3831 | goto out; | 3827 | goto out; |
3832 | } | 3828 | } |
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c index 60f03c4dfbe7..5074c2af17c0 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/wl12xx/ps.c | |||
@@ -160,7 +160,7 @@ out: | |||
160 | } | 160 | } |
161 | 161 | ||
162 | int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, | 162 | int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, |
163 | enum wl1271_cmd_ps_mode mode, u32 rates, bool send) | 163 | enum wl1271_cmd_ps_mode mode) |
164 | { | 164 | { |
165 | int ret; | 165 | int ret; |
166 | u16 timeout = wl->conf.conn.dynamic_ps_timeout; | 166 | u16 timeout = wl->conf.conn.dynamic_ps_timeout; |
diff --git a/drivers/net/wireless/wl12xx/ps.h b/drivers/net/wireless/wl12xx/ps.h index a12052f02026..5f19d4fbbf27 100644 --- a/drivers/net/wireless/wl12xx/ps.h +++ b/drivers/net/wireless/wl12xx/ps.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "acx.h" | 28 | #include "acx.h" |
29 | 29 | ||
30 | int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, | 30 | int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, |
31 | enum wl1271_cmd_ps_mode mode, u32 rates, bool send); | 31 | enum wl1271_cmd_ps_mode mode); |
32 | void wl1271_ps_elp_sleep(struct wl1271 *wl); | 32 | void wl1271_ps_elp_sleep(struct wl1271 *wl); |
33 | int wl1271_ps_elp_wakeup(struct wl1271 *wl); | 33 | int wl1271_ps_elp_wakeup(struct wl1271 *wl); |
34 | void wl1271_elp_work(struct work_struct *work); | 34 | void wl1271_elp_work(struct work_struct *work); |