From 57981a65fbd867fccf83b2c0d5cc8d0d835be056 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 13 Jul 2014 10:42:50 +0100 Subject: [PATCH] staging: vt6656: Drop u8 pointer and rename bScheduleCommand. Rename to vnt_schedule_command removing unused u8 pointer. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/int.c | 12 +++++------- drivers/staging/vt6656/main_usb.c | 2 +- drivers/staging/vt6656/rxtx.c | 2 +- drivers/staging/vt6656/wcmd.c | 4 ++-- drivers/staging/vt6656/wcmd.h | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c index 77bd9dde4887..15841b8a846a 100644 --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c @@ -172,20 +172,18 @@ void INTnsProcessData(struct vnt_private *priv) if (int_data->isr0 != 0) { if (int_data->isr0 & ISR_BNTX && priv->op_mode == NL80211_IFTYPE_AP) - bScheduleCommand(priv, WLAN_CMD_BECON_SEND, NULL); + vnt_schedule_command(priv, WLAN_CMD_BECON_SEND); if (int_data->isr0 & ISR_TBTT) { if (priv->hw->conf.flags & IEEE80211_CONF_PS) - bScheduleCommand((void *) priv, - WLAN_CMD_TBTT_WAKEUP, - NULL); + vnt_schedule_command(priv, + WLAN_CMD_TBTT_WAKEUP); #if 0 /* TODO channel switch */ if (priv->bChannelSwitch) { priv->byChannelSwitchCount--; if (priv->byChannelSwitchCount == 0) - bScheduleCommand((void *) priv, - WLAN_CMD_11H_CHSW, - NULL); + vnt_schedule_command(priv, + WLAN_CMD_11H_CHSW); } #endif } diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index d9b521063a84..ceef9ef3599e 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1137,7 +1137,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) MP_CLEAR_FLAG(priv, fMP_DISCONNECTED); vResetCommandTimer(priv); - bScheduleCommand(priv, WLAN_CMD_INIT_MAC80211, NULL); + vnt_schedule_command(priv, WLAN_CMD_INIT_MAC80211); return 0; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 3dc6d071f012..1f1ec049ace3 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -767,7 +767,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) if (priv->wCurrentRate != current_rate && !(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) { priv->wCurrentRate = current_rate; - bScheduleCommand(priv, WLAN_CMD_SETPOWER, NULL); + vnt_schedule_command(priv, WLAN_CMD_SETPOWER); } if (current_rate > RATE_11M) diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 864d5e59d362..b217efb1667a 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -29,7 +29,7 @@ * s_MgrMakeProbeRequest - Make ProbeRequest packet * CommandTimer - Timer function to handle command * vnt_cmd_complete - Command Complete function - * bScheduleCommand - Push Command and wait Command Scheduler to do + * vnt_schedule_command - Push Command and wait Command Scheduler to do * vCommandTimer- Command call back functions * vnt_cmd_timer_wait- Call back timer * s_bClearBSSID_SCAN- Clear BSSID_SCAN cmd in CMD Queue @@ -184,7 +184,7 @@ void vnt_run_command(struct work_struct *work) return; } -int bScheduleCommand(struct vnt_private *priv, enum vnt_cmd command, u8 *item0) +int vnt_schedule_command(struct vnt_private *priv, enum vnt_cmd command) { if (priv->free_cmd_queue == 0) diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h index 783d6c9a6ccb..3248c95a94cc 100644 --- a/drivers/staging/vt6656/wcmd.h +++ b/drivers/staging/vt6656/wcmd.h @@ -61,7 +61,7 @@ struct vnt_private; void vResetCommandTimer(struct vnt_private *); -int bScheduleCommand(struct vnt_private *, enum vnt_cmd, u8 *); +int vnt_schedule_command(struct vnt_private *, enum vnt_cmd); void vnt_run_command(struct work_struct *work); -- 2.34.1