staging: wilc1000: rename pVoid of struct remain_ch

This patch renames pVoid of struct remain_ch to arg
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 c49bbbf1a1ed2095be8c73461b30896457ec16c3..1ccf45024c5e83bc480ed27536001eadfb13a98e 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2480,7 +2480,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;
@@ -2537,7 +2537,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;
@@ -2611,7 +2611,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;
@@ -4371,7 +4371,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 d3dafc608625929fa65cc98626f6bb5fc8e17288..a69be5574e6eef55989ba6b144bec1f58466e8bc 100644 (file)
--- 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;
 };