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>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index dd09152de9eab84f8ebb2e681ee147944be9063c..5a2cae2356e8e79947a69d038da167d53dae90db 100644 (file)
--- 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 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
                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 ea47a0d03ed27dae3302a62d68f8de0f504c2b7c..8f80497403e384f0915e07f73ef5f35013846f3a 100644 (file)
--- 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;