staging: wilc1000: rename pRemainOnChanReady of struct remain_ch

This patch renames pRemainOnChanReady of struct remain_ch to ready
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 e0ba7202b5843bfb77ff62a50912885d5ade2065..c49bbbf1a1ed2095be8c73461b30896457ec16c3 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2482,7 +2482,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.expired = pstrHostIfRemainOnChan->expired;
-               hif_drv->remain_on_ch.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady;
+               hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
                hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
                hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;
        } else {
@@ -2536,8 +2536,8 @@ ERRORHANDLER:
                          jiffies +
                          msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
 
-               if (hif_drv->remain_on_ch.pRemainOnChanReady)
-                       hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid);
+               if (hif_drv->remain_on_ch.ready)
+                       hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.pVoid);
 
                if (hif_drv->remain_on_ch_pending)
                        hif_drv->remain_on_ch_pending = 0;
@@ -4370,7 +4370,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.expired = RemainOnChanExpired;
-       msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
+       msg.body.remain_on_ch.ready = RemainOnChanReady;
        msg.body.remain_on_ch.pVoid = pvUserArg;
        msg.body.remain_on_ch.u32duration = u32duration;
        msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 3a9f08cc156fcd3cdf7e72f1468f6c630fbde20d..d3dafc608625929fa65cc98626f6bb5fc8e17288 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -239,7 +239,7 @@ struct remain_ch {
        u16 ch;
        u32 u32duration;
        wilc_remain_on_chan_expired expired;
-       wilc_remain_on_chan_ready pRemainOnChanReady;
+       wilc_remain_on_chan_ready ready;
        void *pVoid;
        u32 u32ListenSessionID;
 };