aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChaehyun Lim <chaehyun.lim@gmail.com>2016-01-03 17:35:39 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 15:11:00 -0800
commit482c43301d937dd5d3a565be856d8dda5b51a1dd (patch)
tree8341848883b3b2d686464c2ca9881fe4862665da
parentstaging: wilc1000: rename RemainOnChanReady in wilc_remain_on_channel (diff)
staging: wilc1000: rename pvUserArg in wilc_remain_on_channel
This patch renames pvUserArg to user_arg to avoid camelcase. Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/host_interface.c4
-rw-r--r--drivers/staging/wilc1000/host_interface.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 21d1e87e2db1..3636f7664b21 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -4065,7 +4065,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
u32 duration, u16 chan,
wilc_remain_on_chan_expired expired,
wilc_remain_on_chan_ready ready,
- void *pvUserArg)
+ void *user_arg)
{
int result = 0;
struct host_if_msg msg;
@@ -4082,7 +4082,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.expired = expired;
msg.body.remain_on_ch.ready = ready;
- msg.body.remain_on_ch.arg = pvUserArg;
+ msg.body.remain_on_ch.arg = user_arg;
msg.body.remain_on_ch.duration = duration;
msg.body.remain_on_ch.id = session_id;
msg.vif = vif;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 8a03055bcf5d..4f741ff53f65 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -360,7 +360,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
u32 duration, u16 chan,
wilc_remain_on_chan_expired expired,
wilc_remain_on_chan_ready ready,
- void *pvUserArg);
+ void *user_arg);
int wilc_listen_state_expired(struct wilc_vif *vif, u32 session_id);
int wilc_frame_register(struct wilc_vif *vif, u16 frame_type, bool reg);
int wilc_set_wfi_drv_handler(struct wilc_vif *vif, int index);