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

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: 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 bfb62abc
...@@ -2482,7 +2482,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2482,7 +2482,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.expired = pstrHostIfRemainOnChan->expired; 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.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID; hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;
} else { } else {
...@@ -2536,8 +2536,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, ...@@ -2536,8 +2536,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
jiffies + jiffies +
msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration)); msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
if (hif_drv->remain_on_ch.pRemainOnChanReady) if (hif_drv->remain_on_ch.ready)
hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid); hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.pVoid);
if (hif_drv->remain_on_ch_pending) if (hif_drv->remain_on_ch_pending)
hif_drv->remain_on_ch_pending = 0; 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, ...@@ -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.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.expired = RemainOnChanExpired; 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.pVoid = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration; msg.body.remain_on_ch.u32duration = u32duration;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID; msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
......
...@@ -239,7 +239,7 @@ struct remain_ch { ...@@ -239,7 +239,7 @@ struct remain_ch {
u16 ch; u16 ch;
u32 u32duration; u32 u32duration;
wilc_remain_on_chan_expired expired; wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready pRemainOnChanReady; wilc_remain_on_chan_ready ready;
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