[PATCH V2 19/64] staging: wilc1000: rename pRemainOnChanExpired of struct remain_ch

[Glen Lee]

From: Leo Kim <leo....@atmel.com>

This patch renames pRemainOnChanExpired of struct remain_ch to expired
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo....@atmel.com>
Signed-off-by: Glen Lee <glen....@atmel.com>
---
 drivers/staging/wilc1000/host_interface.c | 10 +++++-----
 drivers/staging/wilc1000/host_interface.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c 
b/drivers/staging/wilc1000/host_interface.c
index 99958f4..e0ba720 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2481,7 +2481,7 @@ static int Handle_RemainOnChan(struct host_if_drv 
*hif_drv,
 
        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.expired = pstrHostIfRemainOnChan->expired;
                hif_drv->remain_on_ch.pRemainOnChanReady = 
pstrHostIfRemainOnChan->pRemainOnChanReady;
                hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
                hif_drv->remain_on_ch.u32ListenSessionID = 
pstrHostIfRemainOnChan->u32ListenSessionID;
@@ -2610,9 +2610,9 @@ static u32 Handle_ListenStateExpired(struct host_if_drv 
*hif_drv,
                        goto _done_;
                }
 
-               if (hif_drv->remain_on_ch.pRemainOnChanExpired) {
-                       
hif_drv->remain_on_ch.pRemainOnChanExpired(hif_drv->remain_on_ch.pVoid,
-                                                                  
pstrHostIfRemainOnChan->u32ListenSessionID);
+               if (hif_drv->remain_on_ch.expired) {
+                       
hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.pVoid,
+                                                     
pstrHostIfRemainOnChan->u32ListenSessionID);
                }
                P2P_LISTEN_STATE = 0;
        } else {
@@ -4369,7 +4369,7 @@ s32 host_int_remain_on_channel(struct host_if_drv 
*hif_drv, u32 u32SessionID,
 
        msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
        msg.body.remain_on_ch.ch = chan;
-       msg.body.remain_on_ch.pRemainOnChanExpired = RemainOnChanExpired;
+       msg.body.remain_on_ch.expired = RemainOnChanExpired;
        msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
        msg.body.remain_on_ch.pVoid = pvUserArg;
        msg.body.remain_on_ch.u32duration = u32duration;
diff --git a/drivers/staging/wilc1000/host_interface.h 
b/drivers/staging/wilc1000/host_interface.h
index dc68711..3a9f08c 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -238,7 +238,7 @@ struct ba_session_info {
 struct remain_ch {
        u16 ch;
        u32 u32duration;
-       wilc_remain_on_chan_expired pRemainOnChanExpired;
+       wilc_remain_on_chan_expired expired;
        wilc_remain_on_chan_ready pRemainOnChanReady;
        void *pVoid;
        u32 u32ListenSessionID;
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel