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

wl12xx: remove 2 unused parameters in wl1271_ps_set_mode()

Browse Source 
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>
This commit is contained in:
Eyal Shapira
2012-01-31 11:57:23 +02:00
committed by Luciano Coelho
parent 1faff895df
commit 248a0018f3
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/wl12xx/debugfs.c
View File

@@ -359,9 +359,7 @@ static ssize_t dynamic_ps_timeout_write(struct file *file,
wl12xx_for_each_wlvif_sta(wl, wlvif) { wl12xx_for_each_wlvif_sta(wl, wlvif) {
if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE, wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE);
wlvif->basic_rate, true);
} }
wl1271_ps_elp_sleep(wl); wl1271_ps_elp_sleep(wl);

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

@@ -2472,8 +2472,7 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) { if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
wl1271_debug(DEBUG_PSM, "psm enabled"); wl1271_debug(DEBUG_PSM, "psm enabled");
ret = wl1271_ps_set_mode(wl, wlvif, ret = wl1271_ps_set_mode(wl, wlvif,
STATION_POWER_SAVE_MODE, STATION_AUTO_PS_MODE);
wlvif->basic_rate, true);
} }
} else if (!(conf->flags & IEEE80211_CONF_PS) && } else if (!(conf->flags & IEEE80211_CONF_PS) &&
test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) { test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
@@ -2483,8 +2482,7 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
ret = wl1271_ps_set_mode(wl, wlvif, ret = wl1271_ps_set_mode(wl, wlvif,
STATION_ACTIVE_MODE, STATION_ACTIVE_MODE);
wlvif->basic_rate, true);
} }
if (conf->power_level != wlvif->power_level) { if (conf->power_level != wlvif->power_level) {
@@ -3824,9 +3822,7 @@ sta_not_found:
!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) { !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
ret = wl1271_ps_set_mode(wl, wlvif, ret = wl1271_ps_set_mode(wl, wlvif,
STATION_AUTO_PS_MODE, STATION_AUTO_PS_MODE);
wlvif->basic_rate,
true);
if (ret < 0) if (ret < 0)
goto out; goto out;
} }

2
drivers/net/wireless/wl12xx/ps.c
View File

@@ -160,7 +160,7 @@ out:
} }
int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
enum wl1271_cmd_ps_mode mode, u32 rates, bool send) enum wl1271_cmd_ps_mode mode)
{ {
int ret; int ret;
u16 timeout = wl->conf.conn.dynamic_ps_timeout; u16 timeout = wl->conf.conn.dynamic_ps_timeout;

2
drivers/net/wireless/wl12xx/ps.h
View File

@@ -28,7 +28,7 @@
#include "acx.h" #include "acx.h"
int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
enum wl1271_cmd_ps_mode mode, u32 rates, bool send); enum wl1271_cmd_ps_mode mode);
void wl1271_ps_elp_sleep(struct wl1271 *wl); void wl1271_ps_elp_sleep(struct wl1271 *wl);
int wl1271_ps_elp_wakeup(struct wl1271 *wl); int wl1271_ps_elp_wakeup(struct wl1271 *wl);
void wl1271_elp_work(struct work_struct *work); void wl1271_elp_work(struct work_struct *work);