From 476e7d97aa86a7d4a47f7c866fced31328d7f5ac Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Tue, 15 Jul 2014 19:54:39 +0100 Subject: [PATCH] staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context. We are just tx the context Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rxtx.c | 4 ++-- drivers/staging/vt6656/usbpipe.c | 2 +- drivers/staging/vt6656/usbpipe.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 1f1ec049ace3..76b7f173f4fa 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -928,7 +928,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) spin_lock_irqsave(&priv->lock, flags); - if (PIPEnsSendBulkOut(priv, tx_context) != STATUS_PENDING) { + if (vnt_tx_context(priv, tx_context) != STATUS_PENDING) { spin_unlock_irqrestore(&priv->lock, flags); return -EIO; } @@ -1022,7 +1022,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, spin_lock_irqsave(&priv->lock, flags); - if (PIPEnsSendBulkOut(priv, context) != STATUS_PENDING) + if (vnt_tx_context(priv, context) != STATUS_PENDING) ieee80211_free_txskb(priv->hw, context->skb); spin_unlock_irqrestore(&priv->lock, flags); diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index e7239d6a616a..db1bc1aaf567 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -337,7 +337,7 @@ static void s_nsBulkInUsbIoCompleteRead(struct urb *urb) * */ -int PIPEnsSendBulkOut(struct vnt_private *priv, +int vnt_tx_context(struct vnt_private *priv, struct vnt_usb_send_context *context) { int status; diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h index 94694fe89356..49c284fde907 100644 --- a/drivers/staging/vt6656/usbpipe.h +++ b/drivers/staging/vt6656/usbpipe.h @@ -40,7 +40,6 @@ void vnt_control_in_u8(struct vnt_private *, u8, u8, u8 *); int vnt_start_interrupt_urb(struct vnt_private *); int PIPEnsBulkInUsbRead(struct vnt_private *, struct vnt_rcb *pRCB); -int PIPEnsSendBulkOut(struct vnt_private *, - struct vnt_usb_send_context *pContext); +int vnt_tx_context(struct vnt_private *, struct vnt_usb_send_context *); #endif /* __USBPIPE_H__ */ -- 2.34.1