Staging: quatech_usb2: fix coding style issues
PATCH 1/1 Staging: quatech_usb2: fix coding style issues
This is a patch to the file quatech_usb2.c that fixes two space before tabular and one line of more than 80 characters warnings found by checkpatch.pl
--- drivers/staging/quatech_usb2/quatech_usb2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/quatech_usb2/quatech_usb2.c +6 -6
@@ -57,7 +57,7 @@ static int debug;#define QT2_HW_FLOW_CONTROL_MASK 0xc5#define QT2_SW_FLOW_CONTROL_MASK 0xc6#define QT2_SW_FLOW_CONTROL_DISABLE 0xc7 -#define QT2_BREAK_CONTROL 0xc8 +#define QT2_BREAK_CONTROL 0xc8#define QT2_STOP_RECEIVE 0xe0#define QT2_FLUSH_DEVICE 0xc4#define QT2_GET_SET_QMCR 0xe1
@@ -207,7 +207,7 @@ struct quatech2_dev {bool ReadBulkStopped;char open_ports;struct usb_serial_port *current_port; -int buffer_size; +int buffer_size; };/* structure which holds line and modem status flags */
@@ -1648,10 +1648,10 @@ __func__); }/*endif*/ if (tty_st && urb->actual_length) {tty_buffer_request_room (tty_st,1 ); -tty_insert_flip_string (tty_st, - &((unsigned char *)(urb->transfer_buffer) - )[i], -1 ); +tty_insert_flip_string (tty_st, &( + (unsigned char *) + (urb->transfer_buffer) + )[i],1 ); } }/*endfor*/ tty_flip_buffer_push (tty_st);
Signature · 1 line
1.6.3.3
Review
Quoted 9 lines · Soeren Moeller
This is a patch to the file
quatech_usb2.cthat fixes two space before tabular and one line of more than 80 characters warnings found by checkpatch.pl(quoted diff) +4
-4- tty_insert_flip_string(tty_st, - &((unsigned char *)(urb->transfer_buffer) - )[i], - 1); + tty_insert_flip_string(tty_st, &( + (unsigned char *) + (urb->transfer_buffer) + )[i], 1);
I think this is unsightly.
Perhaps a macro instead?
--- drivers/staging/quatech_usb2/quatech_usb2.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)
drivers/staging/quatech_usb2/quatech_usb2.c +9 -8
@@ -109,12 +109,15 @@ static int debug;#define QT2_LINE_STATUS_REGISTER 0x05#define QT2_MODEM_STATUS_REGISTER 0x06 +/* handy macro for extracting a byte from a data read transfer buffer */ +#define URB_TBUF (urb, pos) (((unsigned char *)(urb->transfer_buffer))[pos]) +/* handy macros for doing escape sequence parsing on data reads */ -#define THISCHAR ((unsigned char *)(urb->transfer_buffer))[i] -#define NEXTCHAR ((unsigned char *)(urb->transfer_buffer))[i + 1] -#define THIRDCHAR ((unsigned char *)(urb->transfer_buffer))[i + 2] -#define FOURTHCHAR ((unsigned char *)(urb->transfer_buffer))[i + 3] -#define FIFTHCHAR ((unsigned char *)(urb->transfer_buffer))[i + 4] +#define THISCHAR URB_TBUF(urb, i + 0) +#define NEXTCHAR URB_TBUF(urb, i + 1) +#define THIRDCHAR URB_TBUF(urb, i + 2) +#define FOURTHCHAR URB_TBUF(urb, i + 3) +#define FIFTHCHAR URB_TBUF(urb, i + 4)static const struct usb_device_id quausb2_id_table[] = { {USB_DEVICE (USB_VENDOR_ID_QUATECH ,QUATECH_SSU2_100 )},
@@ -1649,9 +1652,7 @@ __func__);if (tty_st && urb->actual_length) {tty_buffer_request_room (tty_st,1 );tty_insert_flip_string (tty_st, - &((unsigned char *)(urb->transfer_buffer) - )[i], -1 ); + &URB_TBUF (urb, i),1 ); } }/*endfor*/ tty_flip_buffer_push (tty_st);
2010/3/30 Joe Perches <[email protected]>
Quoted 12 lines · Soeren Moeller
Quoted 9 lines
This is a patch to the file
quatech_usb2.cthat fixes two space before tabular and one line of more than 80 characters warnings found by checkpatch.pl
- tty_insert_flip_string(tty_st,
- &((unsigned char *)(urb->transfer_buffer)
- )[i],
- 1);
+ tty_insert_flip_string(tty_st, &(
+ (unsigned char *)
+ (urb->transfer_buffer)
+ )[i], 1);
Quoted 3 lines
I think this is unsightly.
Perhaps a macro instead?
The macro seems like a good idea, it makes the code a lot more readable. Thanks for your response
Regards
Sören Möller
Quoted 43 lines
Signed-off-by Joe Perches <[email protected]>---
drivers/staging/quatech_usb2/quatech_usb2.c | 17 +++++++++--------1 files changed, 9 insertions(+), 8 deletions(-)drivers/staging/quatech_usb2/quatech_usb2.c +9
-8@@ -109,12 +109,15 @@ static int debug; #define QT2_LINE_STATUS_REGISTER 0x05 #define QT2_MODEM_STATUS_REGISTER 0x06 +/* handy macro for extracting a byte from a data read transfer buffer */ +#define URB_TBUF (urb, pos) (((unsigned char *)(urb->transfer_buffer))[pos]) + /* handy macros for doing escape sequence parsing on data reads */ -#define THISCHAR ((unsigned char *)(urb->transfer_buffer))[i] -#define NEXTCHAR ((unsigned char *)(urb->transfer_buffer))[i + 1] -#define THIRDCHAR ((unsigned char *)(urb->transfer_buffer))[i + 2] -#define FOURTHCHAR ((unsigned char *)(urb->transfer_buffer))[i + 3] -#define FIFTHCHAR ((unsigned char *)(urb->transfer_buffer))[i + 4] +#define THISCHAR URB_TBUF(urb, i + 0) +#define NEXTCHAR URB_TBUF(urb, i + 1) +#define THIRDCHAR URB_TBUF(urb, i + 2) +#define FOURTHCHAR URB_TBUF(urb, i + 3) +#define FIFTHCHAR URB_TBUF(urb, i + 4) static const struct usb_device_id quausb2_id_table[] = { {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU2_100)},@@ -1649,9 +1652,7 @@ __func__); if (tty_st && urb->actual_length) { tty_buffer_request_room(tty_st, 1); tty_insert_flip_string(tty_st, - &((unsigned char *)(urb->transfer_buffer) - )[i], - 1); + &URB_TBUF(urb, i), 1); } } /*endfor*/ tty_flip_buffer_push(tty_st);