summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Kim <leo.kim@atmel.com>2015-10-28 06:59:36 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-28 23:18:29 (GMT)
commit5beef2ca4f88cdafb05a5cde26052757dfc580e7 (patch)
tree094d682157bed34be0df57fdcaa90f86ecd1fe97
parentd61f8e1eee1deb243ed538f290f90256ecb04975 (diff)
downloadlinux-5beef2ca4f88cdafb05a5cde26052757dfc580e7.tar.xz
staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv
This patch renames u8RemainOnChan_pendingreq of struct host_if_drv to remain_on_ch_pending 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.c10
-rw-r--r--drivers/staging/wilc1000/host_interface.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index dd09152..5a2cae2 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2476,7 +2476,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
u8 u8remain_on_chan_flag;
struct wid wid;
- if (!hif_drv->u8RemainOnChan_pendingreq) {
+ if (!hif_drv->remain_on_ch_pending) {
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
hif_drv->remain_on_ch.pRemainOnChanExpired = pstrHostIfRemainOnChan->pRemainOnChanExpired;
hif_drv->remain_on_ch.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady;
@@ -2488,7 +2488,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
if (hif_drv->usr_scan_req.pfUserScanResult) {
PRINT_INFO(GENERIC_DBG, "Required to remain on chan while scanning return\n");
- hif_drv->u8RemainOnChan_pendingreq = 1;
+ hif_drv->remain_on_ch_pending = 1;
result = -EBUSY;
goto ERRORHANDLER;
}
@@ -2535,8 +2535,8 @@ ERRORHANDLER:
if (hif_drv->remain_on_ch.pRemainOnChanReady)
hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid);
- if (hif_drv->u8RemainOnChan_pendingreq)
- hif_drv->u8RemainOnChan_pendingreq = 0;
+ if (hif_drv->remain_on_ch_pending)
+ hif_drv->remain_on_ch_pending = 0;
}
return result;
@@ -2886,7 +2886,7 @@ static int hostIFthread(void *pvArg)
Handle_ScanDone(msg.drv, SCAN_EVENT_DONE);
- if (hif_drv->u8RemainOnChan_pendingreq)
+ if (hif_drv->remain_on_ch_pending)
Handle_RemainOnChan(msg.drv, &msg.body.remain_on_ch);
break;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ea47a0d..8f80497 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -295,7 +295,7 @@ struct host_if_drv {
struct user_scan_req usr_scan_req;
struct user_conn_req usr_conn_req;
struct remain_ch remain_on_ch;
- u8 u8RemainOnChan_pendingreq;
+ u8 remain_on_ch_pending;
u64 u64P2p_MgmtTimeout;
u8 u8P2PConnect;