Driver: Staging: checkpatch cleanup for drivers/staging/winbond/wb35tx_s.h
Subsystems (2)
PATCH 1/1 Driver: Staging: checkpatch cleanup for drivers/staging/winbond/wb35tx_s.h
checkpatch cleanup for drivers/staging/winbond/wb35tx_s.h
1) Changed c99 comments to c89 comments
2) Removed undesired spaces which were causing checkpatch errors.
drivers/staging/winbond/wb35tx_s.h +25 -25
@@ -3,45 +3,45 @@#include "mds_s.h" -//================== -// IS89C35 Tx related definition -//================== -#define TX_INTERFACE 0 // Interface 1 -#define TX_PIPE 3 // endpoint 4 -#define TX_INTERRUPT 1 // endpoint 2 -#define MAX_INTERRUPT_LENGTH 64 // It must be 64 for EP2 hardware +/********************************** +* IS89C35 Tx related definition +***********************************/ +#define TX_INTERFACE 0/* Interface 1 */ +#define TX_PIPE 3/* Endpoint 4 */ +#define TX_INTERRUPT 1/* Endpoint 2 */ +#define MAX_INTERRUPT_LENGTH 64/* It must be 64 for EP2 hardware */ -//================== -// Internal variable for module -//================== +/********************************** +* Internal variable for module +***********************************/ struct wb35_tx { -// For Tx buffer -u8 TxBuffer[MAX_USB_TX_BUFFER_NUMBER ][MAX_USB_TX_BUFFER ]; +/* For Tx buffer */ +u8 TxBuffer[MAX_USB_TX_BUFFER_NUMBER ][MAX_USB_TX_BUFFER ]; -// For Interrupt pipe +/* For Interrupt pipe */ u8 EP2_buf[MAX_INTERRUPT_LENGTH ]; -atomic_t TxResultCount;// For thread control of EP2 931130.4.m -atomic_t TxFireCounter;// For thread control of EP4 931130.4.n -u32 ByteTransfer; - -u32 TxSendIndex;// The next index of Mds array to be sent -u32 EP2vm_state;// for EP2vm state -u32 EP4vm_state;// for EP4vm state -u32 tx_halt;// Stopping VM +atomic_t TxResultCount;/* For thread control of EP2 931130.4.m */ +atomic_t TxFireCounter;/* For thread control of EP4 931130.4.n */ +u32 ByteTransfer; + +u32 TxSendIndex;/* The next index of Mds array to be sent */ +u32 EP2vm_state;/* for EP2vm state */ +u32 EP4vm_state;/* for EP4vm state */ +u32 tx_halt;/* Stopping VM */ -struct urb * Tx4Urb; -struct urb * Tx2Urb; +struct urb *Tx4Urb; +struct urb *Tx2Urb;int EP2VM_status;int EP4VM_status; -u32 TxFillCount;// 20060928 -u32 TxTimer;// 20060928 Add if sending packet not great than 13 +u32 TxFillCount;/* 20060928 */ +u32 TxTimer;/* 20060928 Add if sending packet not great than 13 */ };#endif
Quoted 5 lines · Harsh Kumar
checkpatch cleanup for
drivers/staging/winbond/wb35tx_s.h1) Changed c99 comments to c89 comments
2) Removed undesired spaces which were causing checkpatch errors.
Can you break this up into two patches.
This doesn't apply for me on linux-next (please redo it so it applies).
Quoted 9 lines
Signed-off-by Harsh Kumar <[email protected]>diff -uprN
a/drivers/staging/winbond/wb35tx_s.hb/drivers/staging/winbond/wb35tx_s.hdrivers/staging/winbond/wb35tx_s.h +0
-0@@ -3,45 +3,45 @@#include "mds_s.h"
drivers/staging/winbond/wb35tx_s.h line 8
Quoted 10 lines
drivers/staging/winbond/wb35tx_s.h +3
-7-//================== -// IS89C35 Tx related definition -//================== -#define TX_INTERFACE 0 // Interface 1 -#define TX_PIPE 3 // endpoint 4 -#define TX_INTERRUPT 1 // endpoint 2 -#define MAX_INTERRUPT_LENGTH 64 // It must be 64 for EP2 hardware +/********************************** +* IS89C35 Tx related definition +***********************************/
Just make these a normal comments.
/* IS89C35 Tx related definitions */
Or for multi-line:
/*
* IS89C35 Tx related blah blah blha blah blah blah blah blha blah
* definitions
*/
There is a section on comments in CodingStyle.
drivers/staging/winbond/wb35tx_s.h line 15
Quoted 7 lines
drivers/staging/winbond/wb35tx_s.h +4
-0+#define TX_INTERFACE 0/* Interface 1 */ +#define TX_PIPE 3/* Endpoint 4 */ +#define TX_INTERRUPT 1/* Endpoint 2 */ +#define MAX_INTERRUPT_LENGTH 64/* It must be 64 for EP2 hardware */
Only one blank line at a time. (Although that was there in the original so that's fine).
Quoted 17 lines
drivers/staging/winbond/wb35tx_s.h +6
-6-//================== -// Internal variable for module -//================== +/********************************** +* Internal variable for module +***********************************/ struct wb35_tx { -// For Tx buffer -u8 TxBuffer[MAX_USB_TX_BUFFER_NUMBER ][MAX_USB_TX_BUFFER ]; +/* For Tx buffer */ +u8 TxBuffer[MAX_USB_TX_BUFFER_NUMBER ][MAX_USB_TX_BUFFER ]; -// For Interrupt pipe +/* For Interrupt pipe */ u8 EP2_buf[MAX_INTERRUPT_LENGTH ];
drivers/staging/winbond/wb35tx_s.h line 28
Quoted 10 lines
drivers/staging/winbond/wb35tx_s.h +1
-8-atomic_t TxResultCount;// For thread control of EP2 931130.4.m -atomic_t TxFireCounter;// For thread control of EP4 931130.4.n -u32 ByteTransfer; - -u32 TxSendIndex;// The next index of Mds array to be sent -u32 EP2vm_state;// for EP2vm state -u32 EP4vm_state;// for EP4vm state -u32 tx_halt;// Stopping VM +atomic_t TxResultCount;/* For thread control of EP2 931130.4.m */
^
Put a space there, between the semi-colon and the comment.
regards,
dan carpenter
Thanks Dan for the reply.
I am a kernel newbie so this will help me learn. I will make the required changes and try to avoid them next time.
Quoted 89 lines · Dan Carpenter
Quoted 5 lines · Harsh Kumar
checkpatch cleanup for
drivers/staging/winbond/wb35tx_s.h1) Changed c99 comments to c89 comments
2) Removed undesired spaces which were causing checkpatch errors.Can you break this up into two patches.
This doesn't apply for me on linux-next (please redo it so it applies).
Quoted 9 lines
Signed-off-by Harsh Kumar <[email protected]>diff -uprN
a/drivers/staging/winbond/wb35tx_s.hb/drivers/staging/winbond/wb35tx_s.hdrivers/staging/winbond/wb35tx_s.h +0
-0@@ -3,45 +3,45 @@#include "mds_s.h" drivers/staging/winbond/wb35tx_s.h line 8
Quoted 10 lines
drivers/staging/winbond/wb35tx_s.h +3
-7-//================== -// IS89C35 Tx related definition -//================== -#define TX_INTERFACE 0 // Interface 1 -#define TX_PIPE 3 // endpoint 4 -#define TX_INTERRUPT 1 // endpoint 2 -#define MAX_INTERRUPT_LENGTH 64 // It must be 64 for EP2 hardware +/********************************** +* IS89C35 Tx related definition +***********************************/ Just make these a normal comments.
/* IS89C35 Tx related definitions */
Or for multi-line:
/*
* IS89C35 Tx related blah blah blha blah blah blah blah blha blah
* definitions
*/There is a section on comments in CodingStyle.
drivers/staging/winbond/wb35tx_s.h line 15
Quoted 7 lines
drivers/staging/winbond/wb35tx_s.h +4
-0+#define TX_INTERFACE 0/* Interface 1 */ +#define TX_PIPE 3/* Endpoint 4 */ +#define TX_INTERRUPT 1/* Endpoint 2 */ +#define MAX_INTERRUPT_LENGTH 64/* It must be 64 for EP2 hardware */ Only one blank line at a time. (Although that was there in the original so that's fine).
Quoted 17 lines
drivers/staging/winbond/wb35tx_s.h +6
-6-//================== -// Internal variable for module -//================== +/********************************** +* Internal variable for module +***********************************/ struct wb35_tx { -// For Tx buffer -u8 TxBuffer[MAX_USB_TX_BUFFER_NUMBER ][MAX_USB_TX_BUFFER ]; +/* For Tx buffer */ +u8 TxBuffer[MAX_USB_TX_BUFFER_NUMBER ][MAX_USB_TX_BUFFER ]; -// For Interrupt pipe +/* For Interrupt pipe */ u8 EP2_buf[MAX_INTERRUPT_LENGTH ];drivers/staging/winbond/wb35tx_s.h line 28
Quoted 10 lines
drivers/staging/winbond/wb35tx_s.h +1
-8-atomic_t TxResultCount;// For thread control of EP2 931130.4.m -atomic_t TxFireCounter;// For thread control of EP4 931130.4.n -u32 ByteTransfer; - -u32 TxSendIndex;// The next index of Mds array to be sent -u32 EP2vm_state;// for EP2vm state -u32 EP4vm_state;// for EP4vm state -u32 tx_halt;// Stopping VM +atomic_t TxResultCount;/* For thread control of EP2 931130.4.m */ ^Put a space there, between the semi-colon and the comment.
regards,
dan carpenter