From: Leo Kim Date: Thu, 15 Oct 2015 04:24:55 +0000 (+0900) Subject: staging: wilc1000: rename variable hSemDeinitDrvHandle X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=27ff21681b4362fb8e0623c260603e39c8aa41d5;p=openwrt%2Fstaging%2Fblogic.git staging: wilc1000: rename variable hSemDeinitDrvHandle This patch renames variable hSemDeinitDrvHandle to hif_sema_driver to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 53e981db2b4d..e3bfad0146dc 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -236,7 +236,7 @@ u8 P2P_LISTEN_STATE; static struct task_struct *hif_thread_handler; static WILC_MsgQueueHandle hif_msg_q; static struct semaphore hif_sema_thread; -struct semaphore hSemDeinitDrvHandle; +struct semaphore hif_sema_driver; static struct semaphore hWaitResponse; struct semaphore hSemHostIntDeinit; struct timer_list g_hPeriodicRSSI; @@ -364,8 +364,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *hif_drv, pstrHostIfSetDrvHandler->u32Address); if (!hif_drv) - up(&hSemDeinitDrvHandle); - + up(&hif_sema_driver); if (s32Error) { PRINT_ER("Failed to set driver handler\n"); @@ -392,8 +391,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *hif_drv, if ((pstrHostIfSetOperationMode->u32Mode) == IDLE_MODE) - up(&hSemDeinitDrvHandle); - + up(&hif_sema_driver); if (s32Error) { PRINT_ER("Failed to set driver handler\n"); @@ -4214,7 +4212,7 @@ s32 host_int_init(struct host_if_drv **hif_drv_handler) PRINT_D(HOSTINF_DBG, "Global handle pointer value=%p\n", hif_drv); if (clients_count == 0) { sema_init(&hif_sema_thread, 0); - sema_init(&hSemDeinitDrvHandle, 0); + sema_init(&hif_sema_driver, 0); sema_init(&hSemHostIntDeinit, 1); } @@ -4320,7 +4318,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv) del_timer_sync(&hif_drv->hRemainOnChannel); host_int_set_wfi_drv_handler(NULL); - down(&hSemDeinitDrvHandle); + down(&hif_sema_driver); if (hif_drv->strWILC_UsrScanReq.pfUserScanResult) { hif_drv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, NULL,