Commit 2e59e40d authored by Gnanachandran Dhanapal's avatar Gnanachandran Dhanapal Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: Timer setup using macro rather assignment 



This patch shall replaces user defined timer setup function with
standard timer setup macro. Also removes init_timer, because timer can
be initialized in setup_timer macro as well.

Signed-off-by: default avatarGnanachandran Dhanapal <gdhanapa@visteon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47eae6dd

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1252,12 +1252,10 @@ static short rtl8192_init(struct net_device *dev) 


	init_hal_dm(dev);



	init_timer(&priv->watch_dog_timer);

	setup_timer(&priv->watch_dog_timer,

		    watch_dog_timer_callback,

		    (unsigned long) dev);



	init_timer(&priv->gpio_polling_timer);

	setup_timer(&priv->gpio_polling_timer,

		    check_rfctrl_gpio_timer,

		    (unsigned long)dev);

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+0 −1
Original line number Diff line number Diff line
@@ -2179,7 +2179,6 @@ static void dm_init_fsync(struct net_device *dev) 
	priv->rtllib->fsync_state = Default_Fsync;

	priv->framesyncMonitor = 1;



	init_timer(&priv->fsync_timer);

	setup_timer(&priv->fsync_timer, dm_fsync_timer_callback,

		   (unsigned long) dev);

}

drivers/staging/rtl8192e/rtl819x_TS.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ struct rx_ts_record { 
	u8				num;

};



void _setup_timer(struct timer_list *, void *, unsigned long);





#endif

drivers/staging/rtl8192e/rtl819x_TSProc.c

+9 −9
Original line number Diff line number Diff line
@@ -154,22 +154,22 @@ void TSInitialize(struct rtllib_device *ieee) 


	for (count = 0; count < TOTAL_TS_NUM; count++) {

		pTxTS->num = count;

		_setup_timer(&pTxTS->TsCommonInfo.SetupTimer,

		setup_timer(&pTxTS->TsCommonInfo.SetupTimer,

			    TsSetupTimeOut,

			    (unsigned long) pTxTS);



		_setup_timer(&pTxTS->TsCommonInfo.InactTimer,

		setup_timer(&pTxTS->TsCommonInfo.InactTimer,

			    TsInactTimeout,

			    (unsigned long) pTxTS);



		_setup_timer(&pTxTS->TsAddBaTimer,

		setup_timer(&pTxTS->TsAddBaTimer,

			    TsAddBaProcess,

			    (unsigned long) pTxTS);



		_setup_timer(&pTxTS->TxPendingBARecord.Timer,

		setup_timer(&pTxTS->TxPendingBARecord.Timer,

			    BaSetupTimeOut,

			    (unsigned long) pTxTS);

		_setup_timer(&pTxTS->TxAdmittedBARecord.Timer,

		setup_timer(&pTxTS->TxAdmittedBARecord.Timer,

			    TxBaInactTimeout,

			    (unsigned long) pTxTS);
@@ -186,19 +186,19 @@ void TSInitialize(struct rtllib_device *ieee) 
		pRxTS->num = count;

		INIT_LIST_HEAD(&pRxTS->RxPendingPktList);



		_setup_timer(&pRxTS->TsCommonInfo.SetupTimer,

		setup_timer(&pRxTS->TsCommonInfo.SetupTimer,

			    TsSetupTimeOut,

			    (unsigned long) pRxTS);



		_setup_timer(&pRxTS->TsCommonInfo.InactTimer,

		setup_timer(&pRxTS->TsCommonInfo.InactTimer,

			    TsInactTimeout,

			    (unsigned long) pRxTS);



		_setup_timer(&pRxTS->RxAdmittedBARecord.Timer,

		setup_timer(&pRxTS->RxAdmittedBARecord.Timer,

			    RxBaInactTimeout,

			    (unsigned long) pRxTS);



		_setup_timer(&pRxTS->RxPktPendingTimer,

		setup_timer(&pRxTS->RxPktPendingTimer,

			    RxPktPendingTimeout,

			    (unsigned long) pRxTS);

drivers/staging/rtl8192e/rtllib_module.c

+0 −6
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ u32 rt_global_debug_component = COMP_ERR; 
EXPORT_SYMBOL(rt_global_debug_component);





void _setup_timer(struct timer_list *ptimer, void *fun, unsigned long data)

{

	ptimer->function = fun;

	ptimer->data = data;

	init_timer(ptimer);

}



static inline int rtllib_networks_allocate(struct rtllib_device *ieee)

{