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,
 
         wl12xx_for_each_wlvif_sta(wl, wlvif) {
                 if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
-                        wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE,
-                                           wlvif->basic_rate, true);
-
+                        wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE);
         }
 
         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,
                 if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
                         wl1271_debug(DEBUG_PSM, "psm enabled");
                         ret = wl1271_ps_set_mode(wl, wlvif,
-                                                 STATION_POWER_SAVE_MODE,
-                                                 wlvif->basic_rate, true);
+                                                 STATION_AUTO_PS_MODE);
                 }
         } else if (!(conf->flags & IEEE80211_CONF_PS) &&
                    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))
                         ret = wl1271_ps_set_mode(wl, wlvif,
-                                                 STATION_ACTIVE_MODE,
-                                                 wlvif->basic_rate, true);
+                                                 STATION_ACTIVE_MODE);
         }
 
         if (conf->power_level != wlvif->power_level) {
@@ -3824,9 +3822,7 @@ sta_not_found:
                     !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
 
                         ret = wl1271_ps_set_mode(wl, wlvif,
-                                                 STATION_AUTO_PS_MODE,
-                                                 wlvif->basic_rate,
-                                                 true);
+                                                 STATION_AUTO_PS_MODE);
                         if (ret < 0)
                                 goto out;
                 }
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:
 }
 
 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;
         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 @@
 #include "acx.h"
 
 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);
 int wl1271_ps_elp_wakeup(struct wl1271 *wl);
 void wl1271_elp_work(struct work_struct *work);