[1/1] ath_hif_usb: changed 'typedef struct' to 'struct' & replaced UsbTxQ with 'struct sk_buff *'

Commit Message

RCore Linux Nov. 8, 2009, 6:57 a.m. UTC

None

Patch

diff --git a/ath/ath9k/ath_hif_usb.c b/ath/ath9k/ath_hif_usb.c
index 0a67763..82634e1 100644
--- a/ath/ath9k/ath_hif_usb.c
+++ b/ath/ath9k/ath_hif_usb.c
@@ -91,37 +91,33 @@  struct cmd_urb_context {
 	struct hif_device_usb *hif_dev;
 };

-struct UsbTxQ {
-	struct sk_buff *buf;
-};
-
-typedef struct _UsbTxUrbContext {
+struct UsbTxUrbContext {
 	u8 index;
 	u8 inUse;
 	struct hif_device_usb *hif_dev;
 	struct sk_buff *buf;
 	struct urb *urb;
-} UsbTxUrbContext;
+};

 struct hif_usb_tx_pipe {
-	u8              usb_pipe;
-	struct UsbTxQ   UsbTxBufQ[ZM_MAX_TX_BUF_NUM];
-	u16             TxBufHead;
-	u16             TxBufTail;
-	u16             TxBufCnt;
-	u16             TxUrbHead;
-	u16             TxUrbTail;
-	u16             TxUrbCnt;
-	UsbTxUrbContext TxUrbCtx[ZM_MAX_TX_URB_NUM];
-	usb_complete_t  complete;
+	u8 usb_pipe;
+	struct sk_buff *UsbTxBufQ[ZM_MAX_TX_BUF_NUM];
+	u16 TxBufHead;
+	u16 TxBufTail;
+	u16 TxBufCnt;
+	u16 TxUrbHead;
+	u16 TxUrbTail;
+	u16 TxUrbCnt;
+	struct UsbTxUrbContext TxUrbCtx[ZM_MAX_TX_URB_NUM];
+	usb_complete_t complete;
 };

-typedef struct _UsbRxUrbContext {
+struct UsbRxUrbContext{
 	u8 inUse;
 	struct hif_device_usb *hif_dev;
 	struct sk_buff *skb;
 	struct urb *urb;
-} UsbRxUrbContext;
+} ;

 struct hif_device_usb {
 	void *htc_handle;
@@ -132,7 +128,7 @@  struct hif_device_usb {
 	u16 device_id;

 	struct sk_buff *regUsbReadBuf;
-	UsbRxUrbContext RxUrbCtx[ZM_MAX_RX_URB_NUM];
+	struct UsbRxUrbContext RxUrbCtx[ZM_MAX_RX_URB_NUM];
 	struct usb_anchor rx_submitted;
 	struct hif_usb_tx_pipe tx_lp;
 	struct hif_usb_tx_pipe tx_mp;
@@ -262,12 +258,12 @@  out:
 	return r;
 }

-static UsbTxUrbContext *zfLnxGetFreeTxUrb(struct hif_device_usb *hif_dev,
+static struct UsbTxUrbContext *zfLnxGetFreeTxUrb(struct
hif_device_usb *hif_dev,
 					  struct hif_usb_tx_pipe *pipe)
 {
-	u16 idx;
-	unsigned long irqFlag;
-	UsbTxUrbContext *ctx = NULL;
+	u16                    idx;
+	unsigned long          irqFlag;
+	struct UsbTxUrbContext *ctx = NULL;

 	spin_lock_irqsave(&(hif_dev->cs_lock), irqFlag);