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: Gnanachandran Dhanapal <gdhanapa@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 49110d32cf88f8f92edf9992a68b641b837cd181..c6cdb43b864c1996813c5d83b0042416335f71f7 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -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);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 1b21f3835446b8dfb3b7712888f1632c66525b8c..3de7cc549794803cfaac646a6b96440544e73040 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -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);
 }

diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h
index b3e721bf975cc834b6d3eaa28c593727c7067e4e..b8fed556928cd458c5a189aad3018a3e8ca3328a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/rtl819x_TS.h
@@ -67,7 +67,6 @@ struct rx_ts_record {
        u8                              num;
 };
 
-void _setup_timer(struct timer_list *, void *, unsigned long);
 
 
 #endif

diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 8a5dd6ef807456ada8a2e360e9e92d5a4ea08573..05aea4321b9def15b83ec322bb861d015e0157ae 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -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);
 

diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index 578b41bbd98a8cd72398130d84651630613c05e5..224dc99af13193a3bb15db033c67625862d3fbb9 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -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)
 {

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 444fac73a8a85c4ff5aa460249032b0ade68178e..d320c31732f242b965635350906e3d0b1e5ab542 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -3019,11 +3019,11 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
 
        ieee->tx_pending.txb = NULL;
 
-       _setup_timer(&ieee->associate_timer,
+       setup_timer(&ieee->associate_timer,
                    rtllib_associate_abort_cb,
                    (unsigned long) ieee);
 
-       _setup_timer(&ieee->beacon_timer,
+       setup_timer(&ieee->beacon_timer,
                    rtllib_send_beacon_cb,
                    (unsigned long) ieee);