Commit edc4b2c5 authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Convert delayed_work_struct_rsl to struct delayed_work and... 


staging: rtl8192e: Convert delayed_work_struct_rsl to struct delayed_work and work_struct_rsl to struct work_struct

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent fc22c052

drivers/staging/rtl8192e/rtl_core.h

+11 −11
Original line number Diff line number Diff line
@@ -561,15 +561,15 @@ struct r8192_priv { 


	short	up;

	short	up_first_time;

	delayed_work_struct_rsl		update_beacon_wq;

	delayed_work_struct_rsl		watch_dog_wq;

	delayed_work_struct_rsl		txpower_tracking_wq;

	delayed_work_struct_rsl		rfpath_check_wq;

	delayed_work_struct_rsl		gpio_change_rf_wq;

	delayed_work_struct_rsl		initialgain_operate_wq;

	delayed_work_struct_rsl		check_hw_scan_wq;

	delayed_work_struct_rsl		hw_scan_simu_wq;

	delayed_work_struct_rsl		start_hw_scan_wq;

	struct delayed_work		update_beacon_wq;

	struct delayed_work		watch_dog_wq;

	struct delayed_work		txpower_tracking_wq;

	struct delayed_work		rfpath_check_wq;

	struct delayed_work		gpio_change_rf_wq;

	struct delayed_work		initialgain_operate_wq;

	struct delayed_work		check_hw_scan_wq;

	struct delayed_work		hw_scan_simu_wq;

	struct delayed_work		start_hw_scan_wq;



	struct workqueue_struct		*priv_wq;
@@ -580,7 +580,7 @@ struct r8192_priv { 
	struct rtl819x_ops			*ops;

	struct rtllib_device			*rtllib;



	work_struct_rsl				reset_wq;

	struct work_struct				reset_wq;



	struct log_int_8190 InterruptLog;
@@ -678,7 +678,7 @@ struct r8192_priv { 


	enum card_type {PCI,MINIPCI,CARDBUS,USB}card_type;



	work_struct_rsl qos_activate;

	struct work_struct qos_activate;



	u8		bIbssCoordinator;

drivers/staging/rtl8192e/rtllib.h

+12 −14
Original line number Diff line number Diff line
@@ -79,11 +79,9 @@ 
#define EXPORT_SYMBOL_RSL(x) EXPORT_SYMBOL(x)





	typedef struct delayed_work delayed_work_struct_rsl;

	#define queue_delayed_work_rsl(x,y,z) queue_delayed_work(x,y,z)

	#define INIT_DELAYED_WORK_RSL(x,y,z) INIT_DELAYED_WORK(x,y)



	typedef struct work_struct work_struct_rsl;

	#define queue_work_rsl(x,y) queue_work(x,y)

	#define INIT_WORK_RSL(x,y,z) INIT_WORK(x,y)
@@ -1864,7 +1862,7 @@ struct rt_pwr_save_ctrl { 
	bool				bHaltAdapterClkRQ;

	bool				bSwRfProcessing;

	RT_RF_POWER_STATE	eInactivePowerState;

	work_struct_rsl		InactivePsWorkItem;

	struct work_struct		InactivePsWorkItem;

	struct timer_list	InactivePsTimer;



	IPS_CALLBACK_FUNCION	ReturnPoint;
@@ -2398,17 +2396,17 @@ struct rtllib_device { 
	/* used if IEEE_SOFTMAC_BEACONS is set */

	struct timer_list beacon_timer;

	u8 need_sw_enc;

	work_struct_rsl associate_complete_wq;

	work_struct_rsl ips_leave_wq;

	delayed_work_struct_rsl associate_procedure_wq;

	delayed_work_struct_rsl softmac_scan_wq;

	delayed_work_struct_rsl softmac_hint11d_wq;

	delayed_work_struct_rsl associate_retry_wq;

	delayed_work_struct_rsl start_ibss_wq;

	delayed_work_struct_rsl hw_wakeup_wq;

	delayed_work_struct_rsl hw_sleep_wq;

	delayed_work_struct_rsl link_change_wq;

	work_struct_rsl wx_sync_scan_wq;

	struct work_struct associate_complete_wq;

	struct work_struct ips_leave_wq;

	struct delayed_work associate_procedure_wq;

	struct delayed_work softmac_scan_wq;

	struct delayed_work softmac_hint11d_wq;

	struct delayed_work associate_retry_wq;

	struct delayed_work start_ibss_wq;

	struct delayed_work hw_wakeup_wq;

	struct delayed_work hw_sleep_wq;

	struct delayed_work link_change_wq;

	struct work_struct wx_sync_scan_wq;



	struct workqueue_struct *wq;