linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case
@ 2014-07-15 18:54 Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 02/12] staging: vt6656: int.c Replace DBG_PRT debug messages Malcolm Priestley
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Camel case changes
pDevice -> priv
ntStatus -> status

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/int.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index dad1543..54016f9 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -77,18 +77,18 @@ static const u8 fallback_rate1[5][5] = {
  *  if we've gotten no data
  *
 -*/
-void INTvWorkItem(struct vnt_private *pDevice)
+void INTvWorkItem(struct vnt_private *priv)
 {
 	unsigned long flags;
-	int ntStatus;
+	int status;
 
 	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Interrupt Polling Thread\n");
 
-	spin_lock_irqsave(&pDevice->lock, flags);
+	spin_lock_irqsave(&priv->lock, flags);
 
-	ntStatus = PIPEnsInterruptRead(pDevice);
+	status = PIPEnsInterruptRead(priv);
 
-	spin_unlock_irqrestore(&pDevice->lock, flags);
+	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
 static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr)
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 02/12] staging: vt6656: int.c Replace DBG_PRT debug messages
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 03/12] staging: vt6656: int rename INTnsProcessData to vnt_int_process_data Malcolm Priestley
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Replace with dev_dbg

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/int.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 54016f9..ddf58f7 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -37,8 +37,6 @@
 #include "power.h"
 #include "usbpipe.h"
 
-static int msglevel = MSG_LEVEL_INFO; /* MSG_LEVEL_DEBUG */
-
 static const u8 fallback_rate0[5][5] = {
 	{RATE_18M, RATE_18M, RATE_12M, RATE_12M, RATE_12M},
 	{RATE_24M, RATE_24M, RATE_18M, RATE_12M, RATE_12M},
@@ -82,7 +80,7 @@ void INTvWorkItem(struct vnt_private *priv)
 	unsigned long flags;
 	int status;
 
-	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Interrupt Polling Thread\n");
+	dev_dbg(&priv->usb->dev, "---->Interrupt Polling Thread\n");
 
 	spin_lock_irqsave(&priv->lock, flags);
 
@@ -152,7 +150,7 @@ void INTnsProcessData(struct vnt_private *priv)
 	struct vnt_interrupt_data *int_data;
 	struct ieee80211_low_level_stats *low_stats = &priv->low_stats;
 
-	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptProcessData\n");
+	dev_dbg(&priv->usb->dev, "---->s_nsInterruptProcessData\n");
 
 	int_data = (struct vnt_interrupt_data *)priv->int_buf.data_buf;
 
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 03/12] staging: vt6656: int rename INTnsProcessData to vnt_int_process_data
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 02/12] staging: vt6656: int.c Replace DBG_PRT debug messages Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 04/12] staging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt Malcolm Priestley
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/int.c     | 2 +-
 drivers/staging/vt6656/int.h     | 2 +-
 drivers/staging/vt6656/usbpipe.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index ddf58f7..36be526 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -145,7 +145,7 @@ static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr)
 	return 0;
 }
 
-void INTnsProcessData(struct vnt_private *priv)
+void vnt_int_process_data(struct vnt_private *priv)
 {
 	struct vnt_interrupt_data *int_data;
 	struct ieee80211_low_level_stats *low_stats = &priv->low_stats;
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 08db868..008545c 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -56,6 +56,6 @@ struct vnt_interrupt_data {
 } __packed;
 
 void INTvWorkItem(struct vnt_private *);
-void INTnsProcessData(struct vnt_private *);
+void vnt_int_process_data(struct vnt_private *);
 
 #endif /* __INT_H__ */
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index dd031bb..13b6852 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -198,7 +198,7 @@ static void s_nsInterruptUsbIoCompleteRead(struct urb *urb)
 
 		dev_dbg(&priv->usb->dev, "%s status = %d\n", __func__, status);
 	} else {
-		INTnsProcessData(priv);
+		vnt_int_process_data(priv);
 	}
 
 	status = usb_submit_urb(priv->pInterruptURB, GFP_ATOMIC);
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 04/12] staging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 02/12] staging: vt6656: int.c Replace DBG_PRT debug messages Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 03/12] staging: vt6656: int rename INTnsProcessData to vnt_int_process_data Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 05/12] staging: vt6656: int.c remove irrelevant function description Malcolm Priestley
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

This function does run as work item, it starts interrupts from the
device.

Rename to vnt_int_start_interrupt

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/int.c      | 2 +-
 drivers/staging/vt6656/int.h      | 2 +-
 drivers/staging/vt6656/main_usb.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 36be526..363e464 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -75,7 +75,7 @@ static const u8 fallback_rate1[5][5] = {
  *  if we've gotten no data
  *
 -*/
-void INTvWorkItem(struct vnt_private *priv)
+void vnt_int_start_interrupt(struct vnt_private *priv)
 {
 	unsigned long flags;
 	int status;
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 008545c..154605c 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -55,7 +55,7 @@ struct vnt_interrupt_data {
 	u8 sw[2];
 } __packed;
 
-void INTvWorkItem(struct vnt_private *);
+void vnt_int_start_interrupt(struct vnt_private *);
 void vnt_int_process_data(struct vnt_private *);
 
 #endif /* __INT_H__ */
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index f0388d6..9890f7d 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -667,7 +667,7 @@ static int vnt_start(struct ieee80211_hw *hw)
 
 	priv->int_interval = 1;  /* bInterval is set to 1 */
 
-	INTvWorkItem(priv);
+	vnt_int_start_interrupt(priv);
 
 	priv->flags |= DEVICE_FLAGS_OPENED;
 
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 05/12] staging: vt6656: int.c remove irrelevant function description
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (2 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 04/12] staging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 06/12] staging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb Malcolm Priestley
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

The function does not directly poll from here

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/int.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 363e464..e78720c 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -53,28 +53,6 @@ static const u8 fallback_rate1[5][5] = {
 	{RATE_54M, RATE_54M, RATE_36M, RATE_18M, RATE_18M}
 };
 
-/*+
- *
- *  Function:   InterruptPollingThread
- *
- *  Synopsis:   Thread running at IRQL PASSIVE_LEVEL.
- *
- *  Arguments: Device Extension
- *
- *  Returns:
- *
- *  Algorithm:  Call USBD for input data;
- *
- *  History:    dd-mm-yyyy   Author    Comment
- *
- *
- *  Notes:
- *
- *  USB reads are by nature 'Blocking', and when in a read, the device looks
- *  like it's in a 'stall' condition, so we deliberately time out every second
- *  if we've gotten no data
- *
--*/
 void vnt_int_start_interrupt(struct vnt_private *priv)
 {
 	unsigned long flags;
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 06/12] staging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (3 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 05/12] staging: vt6656: int.c remove irrelevant function description Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 07/12] staging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_complete Malcolm Priestley
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Drop Read and PIPE. The function starts the interrupt urb.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/int.c     | 2 +-
 drivers/staging/vt6656/usbpipe.c | 2 +-
 drivers/staging/vt6656/usbpipe.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index e78720c..87ac6a1 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -62,7 +62,7 @@ void vnt_int_start_interrupt(struct vnt_private *priv)
 
 	spin_lock_irqsave(&priv->lock, flags);
 
-	status = PIPEnsInterruptRead(priv);
+	status = vnt_start_interrupt_urb(priv);
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 13b6852..a5c55f7 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -131,7 +131,7 @@ void vnt_control_in_u8(struct vnt_private *priv, u8 reg, u8 reg_off, u8 *data)
  *
  */
 
-int PIPEnsInterruptRead(struct vnt_private *priv)
+int vnt_start_interrupt_urb(struct vnt_private *priv)
 {
 	int status = STATUS_FAILURE;
 
diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h
index ea71782..94694fe 100644
--- a/drivers/staging/vt6656/usbpipe.h
+++ b/drivers/staging/vt6656/usbpipe.h
@@ -38,7 +38,7 @@ int vnt_control_in(struct vnt_private *, u8, u16, u16, u16,  u8 *);
 void vnt_control_out_u8(struct vnt_private *, u8, u8, u8);
 void vnt_control_in_u8(struct vnt_private *, u8, u8, u8 *);
 
-int PIPEnsInterruptRead(struct vnt_private *);
+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);
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 07/12] staging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_complete
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (4 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 06/12] staging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 08/12] staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context Malcolm Priestley
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/usbpipe.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index a5c55f7..e7239d6 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -57,7 +57,7 @@
 #define URB_ASYNC_UNLINK    0
 #endif
 
-static void s_nsInterruptUsbIoCompleteRead(struct urb *urb);
+static void vnt_start_interrupt_urb_complete(struct urb *urb);
 static void s_nsBulkInUsbIoCompleteRead(struct urb *urb);
 static void s_nsBulkOutIoCompleteWrite(struct urb *urb);
 
@@ -145,7 +145,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv)
 		usb_rcvintpipe(priv->usb, 1),
 		priv->int_buf.data_buf,
 		MAX_INTERRUPT_SIZE,
-		s_nsInterruptUsbIoCompleteRead,
+		vnt_start_interrupt_urb_complete,
 		priv,
 		priv->int_interval);
 
@@ -173,7 +173,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv)
  *
  */
 
-static void s_nsInterruptUsbIoCompleteRead(struct urb *urb)
+static void vnt_start_interrupt_urb_complete(struct urb *urb)
 {
 	struct vnt_private *priv = urb->context;
 	int status;
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 08/12] staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context.
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (5 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 07/12] staging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_complete Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 09/12] staging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete Malcolm Priestley
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

We are just tx the context

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 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 1f1ec04..76b7f17 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 e7239d6..db1bc1a 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 94694fe..49c284f 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.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 09/12] staging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (6 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 08/12] staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 10/12] staging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb Malcolm Priestley
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/usbpipe.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index db1bc1a..54badfe 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -59,7 +59,7 @@
 
 static void vnt_start_interrupt_urb_complete(struct urb *urb);
 static void s_nsBulkInUsbIoCompleteRead(struct urb *urb);
-static void s_nsBulkOutIoCompleteWrite(struct urb *urb);
+static void vnt_tx_context_complete(struct urb *urb);
 
 int vnt_control_out(struct vnt_private *priv, u8 request, u16 value,
 		u16 index, u16 length, u8 *buffer)
@@ -355,7 +355,7 @@ int vnt_tx_context(struct vnt_private *priv,
 			usb_sndbulkpipe(priv->usb, 3),
 			context->data,
 			context->buf_len,
-			s_nsBulkOutIoCompleteWrite,
+			vnt_tx_context_complete,
 			context);
 
 	status = usb_submit_urb(urb, GFP_ATOMIC);
@@ -370,7 +370,7 @@ int vnt_tx_context(struct vnt_private *priv,
 }
 
 /*
- * Description: s_nsBulkOutIoCompleteWrite
+ * Description: vnt_tx_context_complete
  *     1a) Indicate to the protocol the status of the write.
  *     1b) Return ownership of the packet to the protocol.
  *
@@ -397,7 +397,7 @@ int vnt_tx_context(struct vnt_private *priv,
  *
  */
 
-static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
+static void vnt_tx_context_complete(struct urb *urb)
 {
 	struct vnt_usb_send_context *context = urb->context;
 	struct vnt_private *priv = context->priv;
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 10/12] staging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (7 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 09/12] staging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 11/12] staging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 12/12] staging: vt6656: usbpipe irrelevant function descriptions Malcolm Priestley
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

The function just submits to rx urbs.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/main_usb.c | 2 +-
 drivers/staging/vt6656/usbpipe.c  | 2 +-
 drivers/staging/vt6656/usbpipe.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 9890f7d..b1da23c 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -603,7 +603,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
 		rcb->bBoolInUse = false;
 
 		/* submit rx urb */
-		if (PIPEnsBulkInUsbRead(priv, rcb))
+		if (vnt_submit_rx_urb(priv, rcb))
 			goto free_rx_tx;
 	}
 
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 54badfe..97ad3b6 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -225,7 +225,7 @@ static void vnt_start_interrupt_urb_complete(struct urb *urb)
  *
  */
 
-int PIPEnsBulkInUsbRead(struct vnt_private *priv, struct vnt_rcb *rcb)
+int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
 {
 	int status = 0;
 	struct urb *urb;
diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h
index 49c284f..e74aa08 100644
--- a/drivers/staging/vt6656/usbpipe.h
+++ b/drivers/staging/vt6656/usbpipe.h
@@ -39,7 +39,7 @@ void vnt_control_out_u8(struct vnt_private *, u8, u8, u8);
 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 vnt_submit_rx_urb(struct vnt_private *, struct vnt_rcb *);
 int vnt_tx_context(struct vnt_private *, struct vnt_usb_send_context *);
 
 #endif /* __USBPIPE_H__ */
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 11/12] staging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (8 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 10/12] staging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  2014-07-15 18:54 ` [PATCH 12/12] staging: vt6656: usbpipe irrelevant function descriptions Malcolm Priestley
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/usbpipe.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 97ad3b6..5fcfbf5 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -58,7 +58,7 @@
 #endif
 
 static void vnt_start_interrupt_urb_complete(struct urb *urb);
-static void s_nsBulkInUsbIoCompleteRead(struct urb *urb);
+static void vnt_submit_rx_urb_complete(struct urb *urb);
 static void vnt_tx_context_complete(struct urb *urb);
 
 int vnt_control_out(struct vnt_private *priv, u8 request, u16 value,
@@ -241,7 +241,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
 		usb_rcvbulkpipe(priv->usb, 2),
 		skb_put(rcb->skb, skb_tailroom(rcb->skb)),
 		MAX_TOTAL_SIZE_WITH_ALL_HEADERS,
-		s_nsBulkInUsbIoCompleteRead,
+		vnt_submit_rx_urb_complete,
 		rcb);
 
 	status = usb_submit_urb(urb, GFP_ATOMIC);
@@ -271,7 +271,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
  *
  */
 
-static void s_nsBulkInUsbIoCompleteRead(struct urb *urb)
+static void vnt_submit_rx_urb_complete(struct urb *urb)
 {
 	struct vnt_rcb *rcb = urb->context;
 	struct vnt_private *priv = rcb->pDevice;
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 12/12] staging: vt6656: usbpipe irrelevant function descriptions
  2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
                   ` (9 preceding siblings ...)
  2014-07-15 18:54 ` [PATCH 11/12] staging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete Malcolm Priestley
@ 2014-07-15 18:54 ` Malcolm Priestley
  10 siblings, 0 replies; 12+ messages in thread
From: Malcolm Priestley @ 2014-07-15 18:54 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless, peter.senna, Malcolm Priestley

All these have no or vague meaning.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/staging/vt6656/usbpipe.c | 100 ---------------------------------------
 1 file changed, 100 deletions(-)

diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 5fcfbf5..59e508c 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -117,20 +117,6 @@ void vnt_control_in_u8(struct vnt_private *priv, u8 reg, u8 reg_off, u8 *data)
 			reg_off, reg, sizeof(u8), data);
 }
 
-/*
- * Description:
- *      Allocates an usb interrupt in irp and calls USBD.
- *
- * Parameters:
- *  In:
- *      pDevice     - Pointer to the adapter
- *  Out:
- *      none
- *
- * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver
- *
- */
-
 int vnt_start_interrupt_urb(struct vnt_private *priv)
 {
 	int status = STATUS_FAILURE;
@@ -158,21 +144,6 @@ int vnt_start_interrupt_urb(struct vnt_private *priv)
 	return status;
 }
 
-/*
- * Description:
- *      Complete function of usb interrupt in irp.
- *
- * Parameters:
- *  In:
- *      pDevice     - Pointer to the adapter
- *
- *  Out:
- *      none
- *
- * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver
- *
- */
-
 static void vnt_start_interrupt_urb_complete(struct urb *urb)
 {
 	struct vnt_private *priv = urb->context;
@@ -211,20 +182,6 @@ static void vnt_start_interrupt_urb_complete(struct urb *urb)
 	return;
 }
 
-/*
- * Description:
- *      Allocates an usb BulkIn  irp and calls USBD.
- *
- * Parameters:
- *  In:
- *      pDevice     - Pointer to the adapter
- *  Out:
- *      none
- *
- * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver
- *
- */
-
 int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
 {
 	int status = 0;
@@ -256,21 +213,6 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
 	return status;
 }
 
-/*
- * Description:
- *      Complete function of usb BulkIn irp.
- *
- * Parameters:
- *  In:
- *      pDevice     - Pointer to the adapter
- *
- *  Out:
- *      none
- *
- * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver
- *
- */
-
 static void vnt_submit_rx_urb_complete(struct urb *urb)
 {
 	struct vnt_rcb *rcb = urb->context;
@@ -323,20 +265,6 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
 	return;
 }
 
-/*
- * Description:
- *      Allocates an usb BulkOut  irp and calls USBD.
- *
- * Parameters:
- *  In:
- *      pDevice     - Pointer to the adapter
- *  Out:
- *      none
- *
- * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver
- *
- */
-
 int vnt_tx_context(struct vnt_private *priv,
 				struct vnt_usb_send_context *context)
 {
@@ -369,34 +297,6 @@ int vnt_tx_context(struct vnt_private *priv,
 	return STATUS_PENDING;
 }
 
-/*
- * Description: vnt_tx_context_complete
- *     1a) Indicate to the protocol the status of the write.
- *     1b) Return ownership of the packet to the protocol.
- *
- *     2)  If any more packets are queue for sending, send another packet
- *         to USBD.
- *         If the attempt to send the packet to the driver fails,
- *         return ownership of the packet to the protocol and
- *         try another packet (until one succeeds).
- *
- * Parameters:
- *  In:
- *      pdoUsbDevObj  - pointer to the USB device object which
- *                      completed the irp
- *      pIrp          - the irp which was completed by the
- *                      device object
- *      pContext      - the context given to IoSetCompletionRoutine
- *                      before calling IoCallDriver on the irp
- *                      The pContext is a pointer to the USB device object.
- *  Out:
- *      none
- *
- * Return Value: STATUS_MORE_PROCESSING_REQUIRED - allows the completion routine
- *               (IofCompleteRequest) to stop working on the irp.
- *
- */
-
 static void vnt_tx_context_complete(struct urb *urb)
 {
 	struct vnt_usb_send_context *context = urb->context;
-- 
2.0.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2014-07-15 18:56 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-15 18:54 [PATCH 01/12] staging: vt6656: INTvWorkItem remove camel case Malcolm Priestley
2014-07-15 18:54 ` [PATCH 02/12] staging: vt6656: int.c Replace DBG_PRT debug messages Malcolm Priestley
2014-07-15 18:54 ` [PATCH 03/12] staging: vt6656: int rename INTnsProcessData to vnt_int_process_data Malcolm Priestley
2014-07-15 18:54 ` [PATCH 04/12] staging: vt6656: rename INTvWorkItem to vnt_int_start_interrupt Malcolm Priestley
2014-07-15 18:54 ` [PATCH 05/12] staging: vt6656: int.c remove irrelevant function description Malcolm Priestley
2014-07-15 18:54 ` [PATCH 06/12] staging: vt6656: usbpipe rename PIPEnsInterruptRead to vnt_start_interrupt_urb Malcolm Priestley
2014-07-15 18:54 ` [PATCH 07/12] staging: vt6656: rename s_nsInterruptUsbIoCompleteRead to vnt_start_interrupt_urb_complete Malcolm Priestley
2014-07-15 18:54 ` [PATCH 08/12] staging: vt6656: rename PIPEnsSendBulkOut to vnt_tx_context Malcolm Priestley
2014-07-15 18:54 ` [PATCH 09/12] staging: vt6656: rename s_nsBulkOutIoCompleteWrite to vnt_tx_context_complete Malcolm Priestley
2014-07-15 18:54 ` [PATCH 10/12] staging: vt6656: rename PIPEnsBulkInUsbRead to vnt_submit_rx_urb Malcolm Priestley
2014-07-15 18:54 ` [PATCH 11/12] staging: vt6656: rename s_nsBulkInUsbIoCompleteRead to vnt_submit_rx_urb_complete Malcolm Priestley
2014-07-15 18:54 ` [PATCH 12/12] staging: vt6656: usbpipe irrelevant function descriptions Malcolm Priestley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).