diff options
| author | James A Shackleford | 2014-07-09 21:10:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-09 21:30:46 +0200 |
| commit | 143198fd31f8e7d659d1ae7a59b63c35433dad02 (patch) | |
| tree | 7f9c8d2de3a698f1d09f190b894d9283a36813d0 /drivers/staging/rtl8712 | |
| parent | staging: rtl8712: remove wrapper function _set_workitem() (diff) | |
| download | kernel-qcow2-linux-143198fd31f8e7d659d1ae7a59b63c35433dad02.tar.gz kernel-qcow2-linux-143198fd31f8e7d659d1ae7a59b63c35433dad02.tar.xz kernel-qcow2-linux-143198fd31f8e7d659d1ae7a59b63c35433dad02.zip | |
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>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/drv_types.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_led.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_pwrctrl.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_xmit.h | 6 |
5 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h index 0168745ba191..3d0a98b6d8e5 100644 --- 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 43795e77940e..c80f00683b0f 100644 --- 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 1a90c7f4d8f3..eb612053a3dd 100644 --- 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 70ff924fba04..0526ba077bfc 100644 --- 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 ee906987735a..a9633c3f73d0 100644 --- 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; |