Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 143198fd authored by James A Shackleford's avatar James A Shackleford Committed by Greg Kroah-Hartman
Browse files

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: default avatarJames A Shackleford <shack@linux.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2355b69

drivers/staging/rtl8712/drv_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8712/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {						\

drivers/staging/rtl8712/rtl871x_led.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/staging/rtl8712/rtl871x_pwrctrl.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8712/rtl871x_xmit.h

+3 −3
Original line number Diff line number Diff line
@@ -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;