summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-13 10:42:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 12:22:34 -0700
commit68cc161ee57ee4ea1789a45be42f4c161c577f16 (patch)
tree545963c3ac2ca5b57e24c04dea49f67b45eb138c
parent57981a65fbd867fccf83b2c0d5cc8d0d835be056 (diff)
staging: vt6656: rename vResetCommandTimer to vnt_reset_command_timer
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/main_usb.c2
-rw-r--r--drivers/staging/vt6656/wcmd.c2
-rw-r--r--drivers/staging/vt6656/wcmd.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index ceef9ef3599e..dffd0c77c544 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -1135,7 +1135,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
usb_device_reset(priv);
MP_CLEAR_FLAG(priv, fMP_DISCONNECTED);
- vResetCommandTimer(priv);
+ vnt_reset_command_timer(priv);
vnt_schedule_command(priv, WLAN_CMD_INIT_MAC80211);
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index b217efb1667a..bb9500fcc091 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -202,7 +202,7 @@ int vnt_schedule_command(struct vnt_private *priv, enum vnt_cmd command)
}
-void vResetCommandTimer(struct vnt_private *priv)
+void vnt_reset_command_timer(struct vnt_private *priv)
{
priv->free_cmd_queue = CMD_Q_SIZE;
priv->cmd_dequeue_idx = 0;
diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 3248c95a94cc..0fc2c402fef3 100644
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -59,7 +59,7 @@ enum vnt_cmd_state {
struct vnt_private;
-void vResetCommandTimer(struct vnt_private *);
+void vnt_reset_command_timer(struct vnt_private *);
int vnt_schedule_command(struct vnt_private *, enum vnt_cmd);