staging: wilc1000: rename RemainOnChanExpired in wilc_remain_on_channel

This patch renames RemainOnChanExpired to expired to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.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 116942df424ab3ba784953d9d26d68eed200a299..9265328325d3ba18ebcf6451134d03cf3dd7b130 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -4063,7 +4063,7 @@ void wilc_scan_complete_received(struct wilc *wilc, u8 *pu8Buffer,
 
 int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
                           u32 duration, u16 chan,
-                          wilc_remain_on_chan_expired RemainOnChanExpired,
+                          wilc_remain_on_chan_expired expired,
                           wilc_remain_on_chan_ready RemainOnChanReady,
                           void *pvUserArg)
 {
@@ -4080,7 +4080,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
 
        msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
        msg.body.remain_on_ch.ch = chan;
-       msg.body.remain_on_ch.expired = RemainOnChanExpired;
+       msg.body.remain_on_ch.expired = expired;
        msg.body.remain_on_ch.ready = RemainOnChanReady;
        msg.body.remain_on_ch.arg = pvUserArg;
        msg.body.remain_on_ch.duration = duration;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 4902cc8688a5f3d7b62fa98b0c74524b2cbe6deb..d2ca27eb3284ae5a73f4bdf33c5fd7accf94d684 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -358,7 +358,7 @@ int wilc_setup_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx);
 s32 wilc_del_all_rx_ba_session(struct wilc_vif *vif, char *pBSSID, char TID);
 int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
                           u32 duration, u16 chan,
-                          wilc_remain_on_chan_expired RemainOnChanExpired,
+                          wilc_remain_on_chan_expired expired,
                           wilc_remain_on_chan_ready RemainOnChanReady,
                           void *pvUserArg);
 int wilc_listen_state_expired(struct wilc_vif *vif, u32 session_id);