Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_pwrctrl.c

diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index bf10d6db50e8ba1e638cd3124d83710477d5203d..8f82d85178ab4af33f4d382636c7854a8ff4b152 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -52,7 +52,8 @@ void r8712_set_rpwm(struct _adapter *padapter, u8 val8)
                pwrpriv->cpwm = val8;
                break;
        case PS_STATE_S2:/* only for USB normal powersave mode use,
-                         * temp mark some code. */
+                         * temp mark some code.
+                         */
        case PS_STATE_S3:
        case PS_STATE_S4:
                pwrpriv->cpwm = val8;
@@ -103,14 +104,14 @@ void r8712_cpwm_int_hdl(struct _adapter *padapter,
        if (pwrpriv->cpwm_tog == ((preportpwrstate->state) & 0x80))
                return;
        del_timer(&padapter->pwrctrlpriv.rpwm_check_timer);
-       _enter_pwrlock(&pwrpriv->lock);
+       mutex_lock(&pwrpriv->mutex_lock);
        pwrpriv->cpwm = (preportpwrstate->state) & 0xf;
        if (pwrpriv->cpwm >= PS_STATE_S2) {
                if (pwrpriv->alives & CMD_ALIVE)
-                       up(&(pcmdpriv->cmd_queue_sema));
+                       complete(&(pcmdpriv->cmd_queue_comp));
        }
        pwrpriv->cpwm_tog = (preportpwrstate->state) & 0x80;
-       up(&pwrpriv->lock);
+       mutex_unlock(&pwrpriv->mutex_lock);
 }
 
 static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, uint tag)
@@ -141,10 +142,10 @@ static void SetPSModeWorkItemCallback(struct work_struct *work)
        struct _adapter *padapter = container_of(pwrpriv,
                                    struct _adapter, pwrctrlpriv);
        if (!pwrpriv->bSleep) {
-               _enter_pwrlock(&pwrpriv->lock);
+               mutex_lock(&pwrpriv->mutex_lock);
                if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
                        r8712_set_rpwm(padapter, PS_STATE_S4);
-               up(&pwrpriv->lock);
+               mutex_lock(&pwrpriv->mutex_lock);
        }
 }
 
@@ -155,11 +156,11 @@ static void rpwm_workitem_callback(struct work_struct *work)
        struct _adapter *padapter = container_of(pwrpriv,
                                    struct _adapter, pwrctrlpriv);
        if (pwrpriv->cpwm != pwrpriv->rpwm) {
-               _enter_pwrlock(&pwrpriv->lock);
+               mutex_lock(&pwrpriv->mutex_lock);
                r8712_read8(padapter, SDIO_HCPWM);
                pwrpriv->rpwm_retry = 1;
                r8712_set_rpwm(padapter, pwrpriv->rpwm);
-               up(&pwrpriv->lock);
+               mutex_unlock(&pwrpriv->mutex_lock);
        }
 }
 
@@ -175,7 +176,7 @@ void r8712_init_pwrctrl_priv(struct _adapter *padapter)
        struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
 
        memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct pwrctrl_priv));
-       sema_init(&pwrctrlpriv->lock, 1);
+       mutex_init(&pwrctrlpriv->mutex_lock);
        pwrctrlpriv->cpwm = PS_STATE_S4;
        pwrctrlpriv->pwr_mode = PS_MODE_ACTIVE;
        pwrctrlpriv->smart_ps = 0;
@@ -207,13 +208,13 @@ sint r8712_register_cmd_alive(struct _adapter *padapter)
        uint res = _SUCCESS;
        struct pwrctrl_priv *pwrctrl = &padapter->pwrctrlpriv;
 
-       _enter_pwrlock(&pwrctrl->lock);
+       mutex_lock(&pwrctrl->mutex_lock);
        register_task_alive(pwrctrl, CMD_ALIVE);
        if (pwrctrl->cpwm < PS_STATE_S2) {
                r8712_set_rpwm(padapter, PS_STATE_S3);
                res = _FAIL;
        }
-       up(&pwrctrl->lock);
+       mutex_unlock(&pwrctrl->mutex_lock);
        return res;
 }
 
@@ -229,7 +230,7 @@ void r8712_unregister_cmd_alive(struct _adapter *padapter)
 {
        struct pwrctrl_priv *pwrctrl = &padapter->pwrctrlpriv;
 
-       _enter_pwrlock(&pwrctrl->lock);
+       mutex_lock(&pwrctrl->mutex_lock);
        unregister_task_alive(pwrctrl, CMD_ALIVE);
        if ((pwrctrl->cpwm > PS_STATE_S2) &&
           (pwrctrl->pwr_mode > PS_MODE_ACTIVE)) {
@@ -239,5 +240,5 @@ void r8712_unregister_cmd_alive(struct _adapter *padapter)
                        r8712_set_rpwm(padapter, PS_STATE_S0);
                }
        }
-       up(&pwrctrl->lock);
+       mutex_unlock(&pwrctrl->mutex_lock);
 }