[PATCH 01/10] staging: rtl8723au: Clean up rtw_pm_set_ips23a()

[Jes . Sorensen]

From: Jes Sorensen <jes.soren...@redhat.com>

Signed-off-by: Jes Sorensen <jes.soren...@redhat.com>
---
 drivers/staging/rtl8723au/core/rtw_pwrctrl.c    | 15 ++++++---------
 drivers/staging/rtl8723au/include/rtw_pwrctrl.h |  6 ------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c 
b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
index 7dc7c90..ef29118 100644
--- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
@@ -615,19 +615,16 @@ int rtw_pm_set_ips23a(struct rtw_adapter *padapter, u8 
mode)
 {
        struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
 
-       if (mode == IPS_NORMAL || mode == IPS_LEVEL_2) {
-               rtw_ips_mode_req(pwrctrlpriv, mode);
-               DBG_8723A("%s %s\n", __func__,
-                         mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2");
-               return 0;
-       } else if (mode == IPS_NONE) {
-               rtw_ips_mode_req(pwrctrlpriv, mode);
+       if (mode != IPS_NORMAL && mode != IPS_LEVEL_2 && mode != IPS_NONE)
+               return -EINVAL;
+
+       pwrctrlpriv->ips_mode_req = mode;
+       if (mode == IPS_NONE) {
                DBG_8723A("%s %s\n", __func__, "IPS_NONE");
                if (padapter->bSurpriseRemoved == 0 &&
                    rtw_pwr_wakeup(padapter) == _FAIL)
                        return -EFAULT;
-       } else
-               return -EINVAL;
+       }
 
        return 0;
 }
diff --git a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h 
b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
index 577914d..97bb569 100644
--- a/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723au/include/rtw_pwrctrl.h
@@ -214,12 +214,6 @@ struct pwrctrl_priv {
        unsigned long PS_BBRegBackup[PSBBREG_TOTALCNT];
 };
 
-#define rtw_get_ips_mode_req(pwrctrlpriv) \
-       ((pwrctrlpriv)->ips_mode_req)
-
-#define rtw_ips_mode_req(pwrctrlpriv, ips_mode) \
-       ((pwrctrlpriv)->ips_mode_req = (ips_mode))
-
 #define RTW_PWR_STATE_CHK_INTERVAL 2000
 
 #define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \
-- 
1.9.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel