staging: wilc1000: rename u32ListenSessionID of struct remain_ch

This patch renames u32ListenSessionID of struct remain_ch to id
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 6c490916b2d8b0973ddd04690f5cfc1ef810dd6b..294f90c2450796980b2011025c9af64a03379ec2 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2489,7 +2489,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
                hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
                hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
                hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
-               hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;
+               hif_drv->remain_on_ch.id = pstrHostIfRemainOnChan->id;
        } else {
                pstrHostIfRemainOnChan->ch = hif_drv->remain_on_ch.ch;
        }
@@ -2617,7 +2617,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv,
 
                if (hif_drv->remain_on_ch.expired) {
                        hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg,
-                                                     pstrHostIfRemainOnChan->u32ListenSessionID);
+                                                     pstrHostIfRemainOnChan->id);
                }
                P2P_LISTEN_STATE = 0;
        } else {
@@ -2640,7 +2640,7 @@ static void ListenTimerCB(unsigned long arg)
        memset(&msg, 0, sizeof(struct host_if_msg));
        msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
        msg.drv = hif_drv;
-       msg.body.remain_on_ch.u32ListenSessionID = hif_drv->remain_on_ch.u32ListenSessionID;
+       msg.body.remain_on_ch.id = hif_drv->remain_on_ch.id;
 
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
        if (result)
@@ -4377,7 +4377,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID,
        msg.body.remain_on_ch.ready = RemainOnChanReady;
        msg.body.remain_on_ch.arg = pvUserArg;
        msg.body.remain_on_ch.u32duration = u32duration;
-       msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
+       msg.body.remain_on_ch.id = u32SessionID;
        msg.drv = hif_drv;
 
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
@@ -4402,7 +4402,7 @@ s32 host_int_ListenStateExpired(struct host_if_drv *hif_drv, u32 u32SessionID)
        memset(&msg, 0, sizeof(struct host_if_msg));
        msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
        msg.drv = hif_drv;
-       msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
+       msg.body.remain_on_ch.id = u32SessionID;
 
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
        if (result)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index c338028b5171ed659e4f4740515d155441cc0d6a..8450e22acd7e86e2f9656673861ad9fdfde64657 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -244,7 +244,7 @@ struct remain_ch {
        wilc_remain_on_chan_expired expired;
        wilc_remain_on_chan_ready ready;
        void *arg;
-       u32 u32ListenSessionID;
+       u32 id;
 };
 
 struct reg_frame {