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

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

diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
index dbfb555235450c8aa369d66c9d7baa0ee94ed597..c82fdf85d474c633aa2284b370c09917957275a8 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
@@ -87,16 +87,12 @@ struct reportpwrstate_parm {
        unsigned short rsvd;
 };
 
-static inline void _enter_pwrlock(struct semaphore *plock)
-{
-       _down_sema(plock);
-}
-
 struct pwrctrl_priv {
-       struct semaphore lock;
+       struct mutex mutex_lock;
        /*volatile*/ u8 rpwm; /* requested power state for fw */
        /* fw current power state. updated when 1. read from HCPWM or
-        * 2. driver lowers power level */
+        * 2. driver lowers power level
+        */
        /*volatile*/ u8 cpwm;
        /*volatile*/ u8 tog; /* toggling */
        /*volatile*/ u8 cpwm_tog; /* toggling */