Commit bfb62abc authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename pRemainOnChanExpired of struct remain_ch

This patch renames pRemainOnChanExpired of struct remain_ch to expired
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 839ab709
...@@ -2481,7 +2481,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2481,7 +2481,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
if (!hif_drv->remain_on_ch_pending) { if (!hif_drv->remain_on_ch_pending) {
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid; 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.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch; hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID; hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;
...@@ -2610,8 +2610,8 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv, ...@@ -2610,8 +2610,8 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv,
goto _done_; goto _done_;
} }
if (hif_drv->remain_on_ch.pRemainOnChanExpired) { if (hif_drv->remain_on_ch.expired) {
hif_drv->remain_on_ch.pRemainOnChanExpired(hif_drv->remain_on_ch.pVoid, hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.pVoid,
pstrHostIfRemainOnChan->u32ListenSessionID); pstrHostIfRemainOnChan->u32ListenSessionID);
} }
P2P_LISTEN_STATE = 0; P2P_LISTEN_STATE = 0;
...@@ -4369,7 +4369,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID, ...@@ -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.id = HOST_IF_MSG_REMAIN_ON_CHAN;
msg.body.remain_on_ch.ch = 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.pRemainOnChanReady = RemainOnChanReady;
msg.body.remain_on_ch.pVoid = pvUserArg; msg.body.remain_on_ch.pVoid = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration; msg.body.remain_on_ch.u32duration = u32duration;
......
...@@ -238,7 +238,7 @@ struct ba_session_info { ...@@ -238,7 +238,7 @@ struct ba_session_info {
struct remain_ch { struct remain_ch {
u16 ch; u16 ch;
u32 u32duration; u32 u32duration;
wilc_remain_on_chan_expired pRemainOnChanExpired; wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready pRemainOnChanReady; wilc_remain_on_chan_ready pRemainOnChanReady;
void *pVoid; void *pVoid;
u32 u32ListenSessionID; u32 u32ListenSessionID;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment