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

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

diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 13c018340ff2710f85d97cb906937080547cb578..9f61583af15016bb5900a1c9f2ba13dae5659c2e 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -264,9 +264,9 @@ static struct cmd_obj *cmd_hdl_filter(struct _adapter *padapter,
                 */
                if (padapter->pwrctrlpriv.pwr_mode > PS_MODE_ACTIVE) {
                        padapter->pwrctrlpriv.pwr_mode = PS_MODE_ACTIVE;
-                       _enter_pwrlock(&(padapter->pwrctrlpriv.lock));
+                       mutex_lock(&padapter->pwrctrlpriv.mutex_lock);
                        r8712_set_rpwm(padapter, PS_STATE_S4);
-                       up(&(padapter->pwrctrlpriv.lock));
+                       mutex_unlock(&padapter->pwrctrlpriv.mutex_lock);
                }
                pcmd_r = pcmd;
                break;
@@ -322,7 +322,7 @@ int r8712_cmd_thread(void *context)
 
        allow_signal(SIGTERM);
        while (1) {
-               if ((_down_sema(&(pcmdpriv->cmd_queue_sema))) == _FAIL)
+               if (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp))
                        break;
                if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
                        break;
@@ -395,10 +395,10 @@ _next:
                        }
                        if (pcmd->cmdcode == GEN_CMD_CODE(_SetPwrMode)) {
                                if (padapter->pwrctrlpriv.bSleep) {
-                                       _enter_pwrlock(&(padapter->
-                                                      pwrctrlpriv.lock));
+                                       mutex_lock(&padapter->
+                                                      pwrctrlpriv.mutex_lock);
                                        r8712_set_rpwm(padapter, PS_STATE_S2);
-                                       up(&padapter->pwrctrlpriv.lock);
+                                       mutex_unlock(&padapter->pwrctrlpriv.mutex_lock);
                                }
                        }
                        r8712_free_cmd_obj(pcmd);
@@ -420,7 +420,7 @@ _next:
                        break;
                r8712_free_cmd_obj(pcmd);
        } while (1);
-       up(&pcmdpriv->terminate_cmdthread_sema);
+       complete(&pcmdpriv->terminate_cmdthread_comp);
        thread_exit();
 }