* [PATCH] staging: winbond: wb35rx_s.h Coding style fixes.
@ 2010-03-25 21:41 Lars Lindley
2010-03-27 6:46 ` Pavel Machek
0 siblings, 1 reply; 2+ messages in thread
From: Lars Lindley @ 2010-03-25 21:41 UTC (permalink / raw)
To: gregkh, greg, penberg, pavel; +Cc: devel, linux-kernel, Lars Lindley
I fixed all checkpatch problems except for a couple of long lines.
I also removed version comments.
Signed-off-by: Lars Lindley <lindley@coyote.org>
---
drivers/staging/winbond/wb35rx_s.h | 63 +++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/winbond/wb35rx_s.h b/drivers/staging/winbond/wb35rx_s.h
index 4b03274..3cd0add 100644
--- a/drivers/staging/winbond/wb35rx_s.h
+++ b/drivers/staging/winbond/wb35rx_s.h
@@ -1,44 +1,47 @@
-//============================================================================
-// wb35rx.h --
-//============================================================================
-
-// Definition for this module used
-#define MAX_USB_RX_BUFFER 4096 // This parameter must be 4096 931130.4.f
-
-#define MAX_USB_RX_BUFFER_NUMBER ETHERNET_RX_DESCRIPTORS // Maximum 254, 255 is RESERVED ID
-#define RX_INTERFACE 0 // Interface 1
-#define RX_PIPE 2 // Pipe 3
-#define MAX_PACKET_SIZE 1600 //1568 // 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g
-#define RX_END_TAG 0x0badbeef
-
-
-//====================================
-// Internal variable for module
-//====================================
+/*
+ * ====================================
+ * wb35rx_s.h --
+ * ====================================
+ */
+
+/*Definition for this module used */
+#define MAX_USB_RX_BUFFER 4096 /* This parameter must be 4096 */
+#define MAX_USB_RX_BUFFER_NUMBER ETHERNET_RX_DESCRIPTORS /* Maximum 254, 255 is RESERVED ID */
+#define RX_INTERFACE 0 /* Interface 1 */
+#define RX_PIPE 2 /* Pipe 3 */
+#define MAX_PACKET_SIZE 1600 /* 1568 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data */
+#define RX_END_TAG 0x0badbeef
+
+
+/*
+ * ====================================
+ * Internal variable for module
+ * ====================================
+ */
struct wb35_rx {
- u32 ByteReceived;// For calculating throughput of BulkIn
- atomic_t RxFireCounter;// Does Wb35Rx module fire?
+ u32 ByteReceived; /* For calculating throughput of BulkIn */
+ atomic_t RxFireCounter; /* Does Wb35Rx module fire? */
- u8 RxBuffer[ MAX_USB_RX_BUFFER_NUMBER ][ ((MAX_USB_RX_BUFFER+3) & ~0x03 ) ];
- u16 RxBufferSize[ ((MAX_USB_RX_BUFFER_NUMBER+1) & ~0x01) ];
- u8 RxOwner[ ((MAX_USB_RX_BUFFER_NUMBER+3) & ~0x03 ) ];//Ownership of buffer 0: SW 1:HW
+ u8 RxBuffer[MAX_USB_RX_BUFFER_NUMBER][((MAX_USB_RX_BUFFER + 3) & ~0x03)];
+ u16 RxBufferSize[((MAX_USB_RX_BUFFER_NUMBER + 1) & ~0x01)];
+ u8 RxOwner[((MAX_USB_RX_BUFFER_NUMBER + 3) & ~0x03)]; /* Ownership of buffer 0:SW 1:HW */
- u32 RxProcessIndex;//The next index to process
+ u32 RxProcessIndex; /* The next index to process */
u32 RxBufferId;
u32 EP3vm_state;
- u32 rx_halt; // For VM stopping
+ u32 rx_halt; /* For VM stopping */
u16 MoreDataSize;
u16 PacketSize;
- u32 CurrentRxBufferId; // For complete routine usage
+ u32 CurrentRxBufferId; /* For complete routine usage */
u32 Rx3UrbCancel;
- u32 LastR1; // For RSSI reporting
- struct urb * RxUrb;
- u32 Ep3ErrorCount2; // 20060625.1 Usbd for Rx DMA error count
+ u32 LastR1; /* For RSSI reporting */
+ struct urb *RxUrb;
+ u32 Ep3ErrorCount2; /* Usbd for Rx DMA error count */
- int EP3VM_status;
- u8 * pDRx;
+ int EP3VM_status;
+ u8 *pDRx;
};
--
1.7.0.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: winbond: wb35rx_s.h Coding style fixes.
2010-03-25 21:41 [PATCH] staging: winbond: wb35rx_s.h Coding style fixes Lars Lindley
@ 2010-03-27 6:46 ` Pavel Machek
0 siblings, 0 replies; 2+ messages in thread
From: Pavel Machek @ 2010-03-27 6:46 UTC (permalink / raw)
To: Lars Lindley; +Cc: gregkh, greg, penberg, devel, linux-kernel
On Thu 2010-03-25 22:41:06, Lars Lindley wrote:
> I fixed all checkpatch problems except for a couple of long lines.
> I also removed version comments.
>
> Signed-off-by: Lars Lindley <lindley@coyote.org>
ACK.
> ---
> drivers/staging/winbond/wb35rx_s.h | 63 +++++++++++++++++++-----------------
> 1 files changed, 33 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/staging/winbond/wb35rx_s.h b/drivers/staging/winbond/wb35rx_s.h
> index 4b03274..3cd0add 100644
> --- a/drivers/staging/winbond/wb35rx_s.h
> +++ b/drivers/staging/winbond/wb35rx_s.h
> @@ -1,44 +1,47 @@
> -//============================================================================
> -// wb35rx.h --
> -//============================================================================
> -
> -// Definition for this module used
> -#define MAX_USB_RX_BUFFER 4096 // This parameter must be 4096 931130.4.f
> -
> -#define MAX_USB_RX_BUFFER_NUMBER ETHERNET_RX_DESCRIPTORS // Maximum 254, 255 is RESERVED ID
> -#define RX_INTERFACE 0 // Interface 1
> -#define RX_PIPE 2 // Pipe 3
> -#define MAX_PACKET_SIZE 1600 //1568 // 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data 931130.4.g
> -#define RX_END_TAG 0x0badbeef
> -
> -
> -//====================================
> -// Internal variable for module
> -//====================================
> +/*
> + * ====================================
> + * wb35rx_s.h --
> + * ====================================
> + */
> +
> +/*Definition for this module used */
> +#define MAX_USB_RX_BUFFER 4096 /* This parameter must be 4096 */
> +#define MAX_USB_RX_BUFFER_NUMBER ETHERNET_RX_DESCRIPTORS /* Maximum 254, 255 is RESERVED ID */
> +#define RX_INTERFACE 0 /* Interface 1 */
> +#define RX_PIPE 2 /* Pipe 3 */
> +#define MAX_PACKET_SIZE 1600 /* 1568 8 + 1532 + 4 + 24(IV EIV MIC ICV CRC) for check DMA data */
> +#define RX_END_TAG 0x0badbeef
> +
> +
> +/*
> + * ====================================
> + * Internal variable for module
> + * ====================================
> + */
> struct wb35_rx {
> - u32 ByteReceived;// For calculating throughput of BulkIn
> - atomic_t RxFireCounter;// Does Wb35Rx module fire?
> + u32 ByteReceived; /* For calculating throughput of BulkIn */
> + atomic_t RxFireCounter; /* Does Wb35Rx module fire? */
>
> - u8 RxBuffer[ MAX_USB_RX_BUFFER_NUMBER ][ ((MAX_USB_RX_BUFFER+3) & ~0x03 ) ];
> - u16 RxBufferSize[ ((MAX_USB_RX_BUFFER_NUMBER+1) & ~0x01) ];
> - u8 RxOwner[ ((MAX_USB_RX_BUFFER_NUMBER+3) & ~0x03 ) ];//Ownership of buffer 0: SW 1:HW
> + u8 RxBuffer[MAX_USB_RX_BUFFER_NUMBER][((MAX_USB_RX_BUFFER + 3) & ~0x03)];
> + u16 RxBufferSize[((MAX_USB_RX_BUFFER_NUMBER + 1) & ~0x01)];
> + u8 RxOwner[((MAX_USB_RX_BUFFER_NUMBER + 3) & ~0x03)]; /* Ownership of buffer 0:SW 1:HW */
>
> - u32 RxProcessIndex;//The next index to process
> + u32 RxProcessIndex; /* The next index to process */
> u32 RxBufferId;
> u32 EP3vm_state;
>
> - u32 rx_halt; // For VM stopping
> + u32 rx_halt; /* For VM stopping */
>
> u16 MoreDataSize;
> u16 PacketSize;
>
> - u32 CurrentRxBufferId; // For complete routine usage
> + u32 CurrentRxBufferId; /* For complete routine usage */
> u32 Rx3UrbCancel;
>
> - u32 LastR1; // For RSSI reporting
> - struct urb * RxUrb;
> - u32 Ep3ErrorCount2; // 20060625.1 Usbd for Rx DMA error count
> + u32 LastR1; /* For RSSI reporting */
> + struct urb *RxUrb;
> + u32 Ep3ErrorCount2; /* Usbd for Rx DMA error count */
>
> - int EP3VM_status;
> - u8 * pDRx;
> + int EP3VM_status;
> + u8 *pDRx;
> };
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-27 6:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-25 21:41 [PATCH] staging: winbond: wb35rx_s.h Coding style fixes Lars Lindley
2010-03-27 6:46 ` Pavel Machek
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).