staging: rtl8723bs: remove semaphore remnants

Nothing uses the semaphores any more in this driver, so remove
all references to that type.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index b7dd5fec9b315ee4d2a50d2131a88c4735a4ea65..eb27522a5444ff0f7d40f748fe0983ddfe1e2b69 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -1126,7 +1126,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
        struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
 
        mutex_init(&pwrctrlpriv->lock);
-       sema_init(&pwrctrlpriv->check_32k_lock, 1);
        pwrctrlpriv->rf_pwrstate = rf_on;
        pwrctrlpriv->ips_enter_cnts = 0;
        pwrctrlpriv->ips_leave_cnts = 0;

diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
index 58d1e1019241f8b50ae795752b0cf98cc466c1ad..2f1b51e614fb46063b0d968006e2b38e197ffdf3 100644 (file)
--- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
+++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
@@ -22,7 +22,6 @@
        #include <asm/byteorder.h>
        #include <linux/atomic.h>
        #include <linux/io.h>
-       #include <linux/semaphore.h>
        #include <linux/sem.h>
        #include <linux/sched.h>
        #include <linux/etherdevice.h>
@@ -41,7 +40,6 @@
         #include <net/ieee80211_radiotap.h>
        #include <net/cfg80211.h>
 
-       typedef struct  semaphore _sema;
        typedef spinlock_t      _lock;
        typedef struct mutex            _mutex;
        typedef struct timer_list _timer;

diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index 4f8be55da65dcb86bc81bd724e2078d3e4a62324..99d104b3647a5dccc6ad7a4ea5baaf33b25c85e2 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -115,7 +115,6 @@ struct io_req {
        u32 command;
        u32 status;
        u8 *pbuf;
-       _sema   sema;
 
        void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt);
        u8 *cnxt;

diff --git a/drivers/staging/rtl8723bs/include/rtw_mp.h b/drivers/staging/rtl8723bs/include/rtw_mp.h
index 839084733201b62889563701a0056418b2167bc2..bb3970d58573f2581a77d8c4187276c5dc241125 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_mp.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mp.h
@@ -62,7 +62,6 @@ typedef struct _MPT_CONTEXT
        /*  Indicate if the driver is unloading or unloaded. */
        bool                    bMptDrvUnload;
 
-       _sema                   MPh2c_Sema;
        _timer                  MPh2c_timeout_timer;
 /*  Event used to sync H2c for BT control */
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
index abf48ae01900d0516717c1ac9b0b1a56dcd094cf..e2a4c680125f068238a5ddb645667fbbabe2cf08 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
@@ -94,10 +94,6 @@ struct reportpwrstate_parm {
        unsigned short rsvd;
 };
 
-
-typedef _sema _pwrlock;
-
-
 #define LPS_DELAY_TIME 1*HZ /*  1 sec */
 
 #define EXE_PWR_NONE   0x01
@@ -209,7 +205,6 @@ typedef struct pno_scan_info
 struct pwrctrl_priv
 {
        struct mutex lock;
-       _pwrlock        check_32k_lock;
        volatile u8 rpwm; /*  requested power state for fw */
        volatile u8 cpwm; /*  fw current power state. updated when 1. read from HCPWM 2. driver lowers power level */
        volatile u8 tog; /*  toggling */