Commit 262f55e1 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename variable g_hPeriodicRSSI

This patch renames variable g_hPeriodicRSSI to periodic_rssi
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17225002
...@@ -239,9 +239,7 @@ static struct semaphore hif_sema_thread; ...@@ -239,9 +239,7 @@ static struct semaphore hif_sema_thread;
static struct semaphore hif_sema_driver; static struct semaphore hif_sema_driver;
static struct semaphore hif_sema_wait_response; static struct semaphore hif_sema_wait_response;
static struct semaphore hif_sema_deinit; static struct semaphore hif_sema_deinit;
struct timer_list g_hPeriodicRSSI; struct timer_list periodic_rssi;
u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN]; u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
...@@ -4171,8 +4169,8 @@ static void GetPeriodicRSSI(unsigned long arg) ...@@ -4171,8 +4169,8 @@ static void GetPeriodicRSSI(unsigned long arg)
return; return;
} }
} }
g_hPeriodicRSSI.data = (unsigned long)hif_drv; periodic_rssi.data = (unsigned long)hif_drv;
mod_timer(&g_hPeriodicRSSI, jiffies + msecs_to_jiffies(5000)); mod_timer(&periodic_rssi, jiffies + msecs_to_jiffies(5000));
} }
...@@ -4240,9 +4238,9 @@ s32 host_int_init(struct host_if_drv **hif_drv_handler) ...@@ -4240,9 +4238,9 @@ s32 host_int_init(struct host_if_drv **hif_drv_handler)
result = -EFAULT; result = -EFAULT;
goto _fail_mq_; goto _fail_mq_;
} }
setup_timer(&g_hPeriodicRSSI, GetPeriodicRSSI, setup_timer(&periodic_rssi, GetPeriodicRSSI,
(unsigned long)hif_drv); (unsigned long)hif_drv);
mod_timer(&g_hPeriodicRSSI, jiffies + msecs_to_jiffies(5000)); mod_timer(&periodic_rssi, jiffies + msecs_to_jiffies(5000));
} }
setup_timer(&hif_drv->hScanTimer, TimerCB_Scan, 0); setup_timer(&hif_drv->hScanTimer, TimerCB_Scan, 0);
...@@ -4310,10 +4308,8 @@ s32 host_int_deinit(struct host_if_drv *hif_drv) ...@@ -4310,10 +4308,8 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
} }
if (del_timer_sync(&periodic_rssi))
if (del_timer_sync(&g_hPeriodicRSSI)) {
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
}
del_timer_sync(&hif_drv->hRemainOnChannel); del_timer_sync(&hif_drv->hRemainOnChannel);
...@@ -4334,9 +4330,9 @@ s32 host_int_deinit(struct host_if_drv *hif_drv) ...@@ -4334,9 +4330,9 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
if (clients_count == 1) { if (clients_count == 1) {
if (del_timer_sync(&g_hPeriodicRSSI)) { if (del_timer_sync(&periodic_rssi))
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
}
msg.id = HOST_IF_MSG_EXIT; msg.id = HOST_IF_MSG_EXIT;
msg.drv = hif_drv; msg.drv = hif_drv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment