From: Leo Kim <leo.kim@xxxxxxxxx>
This patch renames pVoid of struct remain_ch to arg
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim <leo.kim@xxxxxxxxx>
Signed-off-by: Glen Lee <glen.lee@xxxxxxxxx>
---
drivers/staging/wilc1000/host_interface.c | 8 ++++----
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 3ee25c6..9ad98fd 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,
struct wid wid;
if (!hif_drv->remain_on_ch_pending) {
- hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
+ hif_drv->remain_on_ch.arg = pstrHostIfRemainOnChan->arg;
hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
@@ -2538,7 +2538,7 @@ ERRORHANDLER:
msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
if (hif_drv->remain_on_ch.ready)
- hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.pVoid);
+ hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.arg);
if (hif_drv->remain_on_ch_pending)
hif_drv->remain_on_ch_pending = 0;
@@ -2612,7 +2612,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.pVoid,
+ hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg,
pstrHostIfRemainOnChan->u32ListenSessionID);
}
P2P_LISTEN_STATE = 0;
@@ -4368,7 +4368,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID,
msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.expired = RemainOnChanExpired;
msg.body.remain_on_ch.ready = RemainOnChanReady;
- msg.body.remain_on_ch.pVoid = pvUserArg;
+ msg.body.remain_on_ch.arg = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
msg.drv = hif_drv;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index bbb9690..230c95a 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -240,7 +240,7 @@ struct remain_ch {
u32 u32duration;
wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready ready;
- void *pVoid;
+ void *arg;
u32 u32ListenSessionID;
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
