From 262f55e1543e9f3c837481da695c3531d2c32dcc Mon Sep 17 00:00:00 2001 From: Leo Kim Date: Thu, 15 Oct 2015 13:24:58 +0900 Subject: [PATCH] staging: wilc1000: rename variable g_hPeriodicRSSI This patch renames variable g_hPeriodicRSSI to periodic_rssi to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 0947e93db0df..fcedceb5fbc7 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -239,9 +239,7 @@ static struct semaphore hif_sema_thread; static struct semaphore hif_sema_driver; static struct semaphore hif_sema_wait_response; static struct semaphore hif_sema_deinit; -struct timer_list g_hPeriodicRSSI; - - +struct timer_list periodic_rssi; u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN]; @@ -4171,8 +4169,8 @@ static void GetPeriodicRSSI(unsigned long arg) return; } } - g_hPeriodicRSSI.data = (unsigned long)hif_drv; - mod_timer(&g_hPeriodicRSSI, jiffies + msecs_to_jiffies(5000)); + periodic_rssi.data = (unsigned long)hif_drv; + mod_timer(&periodic_rssi, jiffies + msecs_to_jiffies(5000)); } @@ -4240,9 +4238,9 @@ s32 host_int_init(struct host_if_drv **hif_drv_handler) result = -EFAULT; goto _fail_mq_; } - setup_timer(&g_hPeriodicRSSI, GetPeriodicRSSI, + setup_timer(&periodic_rssi, GetPeriodicRSSI, (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); @@ -4310,10 +4308,8 @@ s32 host_int_deinit(struct host_if_drv *hif_drv) PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); } - - if (del_timer_sync(&g_hPeriodicRSSI)) { + if (del_timer_sync(&periodic_rssi)) PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n"); - } del_timer_sync(&hif_drv->hRemainOnChannel); @@ -4334,9 +4330,9 @@ s32 host_int_deinit(struct host_if_drv *hif_drv) memset(&msg, 0, sizeof(struct host_if_msg)); 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"); - } + msg.id = HOST_IF_MSG_EXIT; msg.drv = hif_drv; -- 2.34.1