aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Kim <leo.kim@atmel.com>2015-10-29 11:58:29 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-15 20:02:47 -0800
commite55e49670b673d7ab9f7fb51d3530347f327fd40 (patch)
tree5a7413c9cfd45b1b793f638a11d5c031afd11731
parentstaging: wilc1000: rename hSemTestKeyBlock of struct host_if_drv (diff)
staging: wilc1000: rename hSemTestDisconnectBlock of struct host_if_drv
This patch renames hSemTestDisconnectBlock of struct host_if_drv to sem_test_disconn_block to avoid CamelCase naming convention. Signed-off-by: Leo Kim <leo.kim@atmel.com> Signed-off-by: Glen Lee <glen.lee@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/host_interface.c6
-rw-r--r--drivers/staging/wilc1000/host_interface.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 99bf633b73dc..4daef636ecbc 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2041,7 +2041,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
}
}
- up(&hif_drv->hSemTestDisconnectBlock);
+ up(&hif_drv->sem_test_disconn_block);
}
void resolve_disconnect_aberration(struct host_if_drv *hif_drv)
@@ -3563,7 +3563,7 @@ s32 host_int_disconnect(struct host_if_drv *hif_drv, u16 u16ReasonCode)
if (result)
PRINT_ER("Failed to send message queue: disconnect\n");
- down(&hif_drv->hSemTestDisconnectBlock);
+ down(&hif_drv->sem_test_disconn_block);
return result;
}
@@ -4108,7 +4108,7 @@ s32 host_int_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
}
sema_init(&hif_drv->sem_test_key_block, 0);
- sema_init(&hif_drv->hSemTestDisconnectBlock, 0);
+ sema_init(&hif_drv->sem_test_disconn_block, 0);
sema_init(&hif_drv->hSemGetRSSI, 0);
sema_init(&hif_drv->hSemGetLINKSPEED, 0);
sema_init(&hif_drv->hSemGetCHNL, 0);
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index a8fd290f8eb3..0c7a77389613 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -306,7 +306,7 @@ struct host_if_drv {
struct semaphore sem_cfg_values;
struct semaphore sem_test_key_block;
- struct semaphore hSemTestDisconnectBlock;
+ struct semaphore sem_test_disconn_block;
struct semaphore hSemGetRSSI;
struct semaphore hSemGetLINKSPEED;
struct semaphore hSemGetCHNL;