staging: rtl8712: remove #define _workitem struct work_struct

_workitem is just a #define for work_struct.  Remove the #define and
use struct work_struct directly instead.

Signed-off-by: James A Shackleford <shack@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h
index 0168745ba191752168dda76a88db92a3dba89a5d..3d0a98b6d8e58075e22e2e76acf0ee15387271c8 100644 (file)
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -173,7 +173,7 @@ struct _adapter {
        struct net_device_stats stats;
        struct iw_statistics iwstats;
        int pid; /*process id from UI*/
-       _workitem wkFilterRxFF0;
+       struct work_struct wkFilterRxFF0;
        u8 blnEnableRxFF0Filter;
        spinlock_t lockRxFF0Filter;
        const struct firmware *fw;

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 43795e77940e0888e3f9b61813a9f1482f25f567..c80f00683b0f67c4b6660fb8c3676f941be48f8d 100644 (file)
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -50,7 +50,6 @@ struct        __queue {
 #define _pkt struct sk_buff
 #define _buffer unsigned char
 #define thread_exit() complete_and_exit(NULL, 0)
-#define _workitem struct work_struct
 
 #define _init_queue(pqueue)                            \
        do {                                            \

diff --git a/drivers/staging/rtl8712/rtl871x_led.h b/drivers/staging/rtl8712/rtl871x_led.h
index 1a90c7f4d8f3182a63f6731dff5d1a490a6b372c..eb612053a3ddee69e3c6da8dc15f7112f77f15b8 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_led.h
+++ b/drivers/staging/rtl8712/rtl871x_led.h
@@ -99,7 +99,7 @@ struct LED_871x {
                                                   * either LED_ON or OFF.*/
 
        struct timer_list       BlinkTimer; /* Timer object for led blinking.*/
-       _workitem               BlinkWorkItem; /* Workitem used by BlinkTimer */
+       struct work_struct      BlinkWorkItem; /* Workitem used by BlinkTimer */
 };
 
 struct led_priv {

diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
index 70ff924fba04c213f8d3971e5642495433b9bf05..0526ba077bfc8fefd94653ce541b27d0b304efd1 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
@@ -107,8 +107,8 @@ struct      pwrctrl_priv {
        uint ImrContent;        /* used to store original imr. */
        uint bSleep; /* sleep -> active is different from active -> sleep. */
 
-       _workitem SetPSModeWorkItem;
-       _workitem rpwm_workitem;
+       struct work_struct SetPSModeWorkItem;
+       struct work_struct rpwm_workitem;
        struct timer_list rpwm_check_timer;
        u8      rpwm_retry;
        uint    bSetPSModeWorkItemInProgress;

diff --git a/drivers/staging/rtl8712/rtl871x_xmit.h b/drivers/staging/rtl8712/rtl871x_xmit.h
index ee906987735a78eca0d0f506d4b4008375aac8fe..a9633c3f73d014108f230add62e3d2ce50d94db5 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_xmit.h
+++ b/drivers/staging/rtl8712/rtl871x_xmit.h
@@ -233,9 +233,9 @@ struct      xmit_priv {
        u8      hwxmit_entry;
        u8      txirp_cnt;
        struct tasklet_struct xmit_tasklet;
-       _workitem xmit_pipe4_reset_wi;
-       _workitem xmit_pipe6_reset_wi;
-       _workitem xmit_piped_reset_wi;
+       struct work_struct xmit_pipe4_reset_wi;
+       struct work_struct xmit_pipe6_reset_wi;
+       struct work_struct xmit_piped_reset_wi;
        /*per AC pending irp*/
        int beq_cnt;
        int bkq_cnt;