USB: serial: Changes to conform with checkpatch.
Subsystems (2)
cover USB: serial: Changes to conform with checkpatch.
Removed various checkpatch.sh warnings and errors. Split patch by warning/error type. Corrected line wraps in emails.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 106 +++++++++++++++++++++--------------------- 1 files changed, 53 insertions(+), 53 deletions(-)
drivers/usb/serial/keyspan.c +53 -53
@@ -135,7 +135,7 @@ module_usb_serial_driver(serial_drivers, keyspan_ids_combined);static void keyspan_break_ctl (struct tty_struct *tty,int break_state) {struct usb_serial_port *port = tty->driver_data; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv; p_priv =usb_get_serial_port_data (port);
@@ -152,9 +152,9 @@ static void keyspan_set_termios(struct tty_struct *tty, struct usb_serial_port *port, struct ktermios *old_termios) { int baud_rate, device_port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details; -unsigned int cflag; +unsigned int cflag; p_priv =usb_get_serial_port_data (port); d_details = p_priv->device_details;
@@ -223,12 +223,12 @@ static int keyspan_tiocmset(struct tty_struct *tty,static int keyspan_write (struct tty_struct *tty,struct usb_serial_port *port,const unsigned char *buf,int count) { -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;int flip; -int left, todo; +int left, todo;struct urb *this_urb; -int err, maxDataLen, dataOffset; +int err, maxDataLen, dataOffset; p_priv =usb_get_serial_port_data (port); d_details = p_priv->device_details;
@@ -299,7 +299,7 @@ static void usa26_indat_callback(struct urb *urb)int endpoint;struct usb_serial_port *port;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; endpoint =usb_pipeendpoint (urb->pipe);
@@ -382,11 +382,11 @@ static void usa26_outcont_callback(struct urb *urb)static void usa26_instat_callback (struct urb *urb) { -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa26_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty;int old_dcd_state, err;int status = urb->status;
@@ -514,11 +514,11 @@ static void usa28_outcont_callback(struct urb *urb)static void usa28_instat_callback (struct urb *urb) {int err; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa28_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty;int old_dcd_state;int status = urb->status;
@@ -602,11 +602,11 @@ static void usa49_glocont_callback(struct urb *urb)static void usa49_instat_callback (struct urb *urb) {int err; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa49_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;int old_dcd_state;int status = urb->status;
@@ -670,7 +670,7 @@ static void usa49_indat_callback(struct urb *urb)int endpoint;struct usb_serial_port *port;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; endpoint =usb_pipeendpoint (urb->pipe);
@@ -719,7 +719,7 @@ static void usa49wg_indat_callback(struct urb *urb)struct usb_serial *serial;struct usb_serial_port *port;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; serial = urb->context;
@@ -791,9 +791,9 @@ static void usa90_indat_callback(struct urb *urb)int i, err;int endpoint;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; endpoint =usb_pipeendpoint (urb->pipe);
@@ -856,11 +856,11 @@ static void usa90_indat_callback(struct urb *urb)static void usa90_instat_callback (struct urb *urb) { -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa90_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty;int old_dcd_state, err;int status = urb->status;
@@ -924,11 +924,11 @@ static void usa90_outcont_callback(struct urb *urb)static void usa67_instat_callback (struct urb *urb) {int err; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa67_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;int old_dcd_state;int status = urb->status;
@@ -1035,9 +1035,9 @@ static int keyspan_write_room(struct tty_struct *tty)static int keyspan_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct keyspan_port_private *p_priv; -struct keyspan_serial_private *s_priv; -struct usb_serial *serial = port->serial; +struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct usb_serial *serial = port->serial;const struct keyspan_device_details *d_details;int i, err;int baud_rate, device_port;
@@ -1130,8 +1130,8 @@ static void keyspan_close(struct usb_serial_port *port) {int i;struct usb_serial *serial = port->serial; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -1167,8 +1167,8 @@ static void keyspan_close(struct usb_serial_port *port)/* download the firmware to a pre-renumeration device */ static int keyspan_fake_startup (struct usb_serial *serial) { -int response; -const struct ihex_binrec *record; +int response; +const struct ihex_binrec *record;char *fw_name;const struct firmware *fw;
@@ -1398,7 +1398,7 @@ static struct callbacks {static void keyspan_setup_urbs (struct usb_serial *serial) {int i, j; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv;const struct keyspan_device_details *d_details;struct usb_serial_port *port;struct keyspan_port_private *p_priv;
@@ -1472,7 +1472,7 @@ static void keyspan_setup_urbs(struct usb_serial *serial)static int keyspan_usa19_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ div,/* divisor */ cnt;/* inverse of divisor (programmed into 8051) */
@@ -1512,7 +1512,7 @@ static int keyspan_usa19_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,static int keyspan_usa19hs_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ div;/* divisor */ dbg ("%s - %d." , __func__, baud_rate);
@@ -1547,7 +1547,7 @@ static int keyspan_usa19hs_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,static int keyspan_usa19w_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ clk,/* clock with 13/8 prescaler */ div,/* divisor using 13/8 prescaler */ res, /* resulting baud rate using 13/8 prescaler */
@@ -1610,7 +1610,7 @@ static int keyspan_usa19w_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,static int keyspan_usa28_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ div,/* divisor */ cnt;/* inverse of divisor (programmed into 8051) */
@@ -1656,12 +1656,12 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa26_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details; -int outcont_urb; +int outcont_urb;struct urb *this_urb; -int device_port, err; +int device_port, err;dbg ("%s reset=%d" , __func__, reset_port);
@@ -1812,11 +1812,11 @@ static int keyspan_usa28_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa28_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int device_port, err; +int device_port, err; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -1936,12 +1936,12 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa49_portControlMessage msg; -struct usb_ctrlrequest *dr =NULL ; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct usb_ctrlrequest *dr =NULL ; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int err, device_port; +int err, device_port; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -2122,11 +2122,11 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa90_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int err; +int err;u8 prescaler; s_priv =usb_get_serial_data (serial);
@@ -2253,11 +2253,11 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa67_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int err, device_port; +int err, device_port; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -2428,7 +2428,7 @@ static int keyspan_startup(struct usb_serial *serial) {int i, err;struct usb_serial_port *port; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv;struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;
@@ -2488,7 +2488,7 @@ static void keyspan_disconnect(struct usb_serial *serial) {int i, j;struct usb_serial_port *port; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv;struct keyspan_port_private *p_priv; s_priv =usb_get_serial_data (serial);
@@ -2528,7 +2528,7 @@ static void keyspan_release(struct usb_serial *serial) {int i;struct usb_serial_port *port; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv; s_priv =usb_get_serial_data (serial);
Signature · 1 line
1.7.2.5
PATCH 1/6 USB: serial: Removed space before tabs.
Changes to conform with checkpatch.sh script. - no space before tabs. Removed 52 checkpatch.sh warnings.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 106 +++++++++++++++++++++--------------------- 1 files changed, 53 insertions(+), 53 deletions(-)
drivers/usb/serial/keyspan.c +53 -53
@@ -135,7 +135,7 @@ module_usb_serial_driver(serial_drivers, keyspan_ids_combined);static void keyspan_break_ctl (struct tty_struct *tty,int break_state) {struct usb_serial_port *port = tty->driver_data; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv; p_priv =usb_get_serial_port_data (port);
@@ -152,9 +152,9 @@ static void keyspan_set_termios(struct tty_struct *tty, struct usb_serial_port *port, struct ktermios *old_termios) { int baud_rate, device_port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details; -unsigned int cflag; +unsigned int cflag; p_priv =usb_get_serial_port_data (port); d_details = p_priv->device_details;
@@ -223,12 +223,12 @@ static int keyspan_tiocmset(struct tty_struct *tty,static int keyspan_write (struct tty_struct *tty,struct usb_serial_port *port,const unsigned char *buf,int count) { -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;int flip; -int left, todo; +int left, todo;struct urb *this_urb; -int err, maxDataLen, dataOffset; +int err, maxDataLen, dataOffset; p_priv =usb_get_serial_port_data (port); d_details = p_priv->device_details;
@@ -299,7 +299,7 @@ static void usa26_indat_callback(struct urb *urb)int endpoint;struct usb_serial_port *port;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; endpoint =usb_pipeendpoint (urb->pipe);
@@ -382,11 +382,11 @@ static void usa26_outcont_callback(struct urb *urb)static void usa26_instat_callback (struct urb *urb) { -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa26_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty;int old_dcd_state, err;int status = urb->status;
@@ -514,11 +514,11 @@ static void usa28_outcont_callback(struct urb *urb)static void usa28_instat_callback (struct urb *urb) {int err; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa28_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty;int old_dcd_state;int status = urb->status;
@@ -602,11 +602,11 @@ static void usa49_glocont_callback(struct urb *urb)static void usa49_instat_callback (struct urb *urb) {int err; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa49_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;int old_dcd_state;int status = urb->status;
@@ -670,7 +670,7 @@ static void usa49_indat_callback(struct urb *urb)int endpoint;struct usb_serial_port *port;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; endpoint =usb_pipeendpoint (urb->pipe);
@@ -719,7 +719,7 @@ static void usa49wg_indat_callback(struct urb *urb)struct usb_serial *serial;struct usb_serial_port *port;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; serial = urb->context;
@@ -791,9 +791,9 @@ static void usa90_indat_callback(struct urb *urb)int i, err;int endpoint;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;int status = urb->status; endpoint =usb_pipeendpoint (urb->pipe);
@@ -856,11 +856,11 @@ static void usa90_indat_callback(struct urb *urb)static void usa90_instat_callback (struct urb *urb) { -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa90_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;struct tty_struct *tty;int old_dcd_state, err;int status = urb->status;
@@ -924,11 +924,11 @@ static void usa90_outcont_callback(struct urb *urb)static void usa67_instat_callback (struct urb *urb) {int err; -unsigned char *data = urb->transfer_buffer; +unsigned char *data = urb->transfer_buffer;struct keyspan_usa67_portStatusMessage *msg;struct usb_serial *serial;struct usb_serial_port *port; -struct keyspan_port_private *p_priv; +struct keyspan_port_private *p_priv;int old_dcd_state;int status = urb->status;
@@ -1035,9 +1035,9 @@ static int keyspan_write_room(struct tty_struct *tty)static int keyspan_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct keyspan_port_private *p_priv; -struct keyspan_serial_private *s_priv; -struct usb_serial *serial = port->serial; +struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct usb_serial *serial = port->serial;const struct keyspan_device_details *d_details;int i, err;int baud_rate, device_port;
@@ -1130,8 +1130,8 @@ static void keyspan_close(struct usb_serial_port *port) {int i;struct usb_serial *serial = port->serial; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -1167,8 +1167,8 @@ static void keyspan_close(struct usb_serial_port *port)/* download the firmware to a pre-renumeration device */ static int keyspan_fake_startup (struct usb_serial *serial) { -int response; -const struct ihex_binrec *record; +int response; +const struct ihex_binrec *record;char *fw_name;const struct firmware *fw;
@@ -1398,7 +1398,7 @@ static struct callbacks {static void keyspan_setup_urbs (struct usb_serial *serial) {int i, j; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv;const struct keyspan_device_details *d_details;struct usb_serial_port *port;struct keyspan_port_private *p_priv;
@@ -1472,7 +1472,7 @@ static void keyspan_setup_urbs(struct usb_serial *serial)static int keyspan_usa19_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ div,/* divisor */ cnt;/* inverse of divisor (programmed into 8051) */
@@ -1512,7 +1512,7 @@ static int keyspan_usa19_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,static int keyspan_usa19hs_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ div;/* divisor */ dbg ("%s - %d." , __func__, baud_rate);
@@ -1547,7 +1547,7 @@ static int keyspan_usa19hs_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,static int keyspan_usa19w_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ clk,/* clock with 13/8 prescaler */ div,/* divisor using 13/8 prescaler */ res, /* resulting baud rate using 13/8 prescaler */
@@ -1610,7 +1610,7 @@ static int keyspan_usa19w_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,static int keyspan_usa28_calc_baud (u32 baud_rate,u32 baudclk,u8 *rate_hi,u8 *rate_low,u8 *prescaler,int portnum) { -u32 b16,/* baud rate times 16 (actual rate used internally) */ +u32 b16,/* baud rate times 16 (actual rate used internally) */ div,/* divisor */ cnt;/* inverse of divisor (programmed into 8051) */
@@ -1656,12 +1656,12 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa26_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details; -int outcont_urb; +int outcont_urb;struct urb *this_urb; -int device_port, err; +int device_port, err;dbg ("%s reset=%d" , __func__, reset_port);
@@ -1812,11 +1812,11 @@ static int keyspan_usa28_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa28_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int device_port, err; +int device_port, err; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -1936,12 +1936,12 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa49_portControlMessage msg; -struct usb_ctrlrequest *dr =NULL ; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct usb_ctrlrequest *dr =NULL ; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int err, device_port; +int err, device_port; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -2122,11 +2122,11 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa90_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int err; +int err;u8 prescaler; s_priv =usb_get_serial_data (serial);
@@ -2253,11 +2253,11 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial, int reset_port) {struct keyspan_usa67_portControlMessage msg; -struct keyspan_serial_private *s_priv; -struct keyspan_port_private *p_priv; +struct keyspan_serial_private *s_priv; +struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;struct urb *this_urb; -int err, device_port; +int err, device_port; s_priv =usb_get_serial_data (serial); p_priv =usb_get_serial_port_data (port);
@@ -2428,7 +2428,7 @@ static int keyspan_startup(struct usb_serial *serial) {int i, err;struct usb_serial_port *port; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv;struct keyspan_port_private *p_priv;const struct keyspan_device_details *d_details;
@@ -2488,7 +2488,7 @@ static void keyspan_disconnect(struct usb_serial *serial) {int i, j;struct usb_serial_port *port; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv;struct keyspan_port_private *p_priv; s_priv =usb_get_serial_data (serial);
@@ -2528,7 +2528,7 @@ static void keyspan_release(struct usb_serial *serial) {int i;struct usb_serial_port *port; -struct keyspan_serial_private *s_priv; +struct keyspan_serial_private *s_priv; s_priv =usb_get_serial_data (serial);
Signature · 1 line
1.7.2.5
PATCH 2/6 USB: serial: Fix spacing around conditional.
In reply to Ben MinerdsChanges to conform with checkpatch.sh script. - spaces around '?' and ':'.Removed 14 checkpatch.sh errors.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
drivers/usb/serial/keyspan.c +9 -9
@@ -176,7 +176,7 @@ static void keyspan_set_termios(struct tty_struct *tty,tty_encode_baud_rate (tty, baud_rate, baud_rate);/* set CTS/RTS handshake etc. */ p_priv->cflag = cflag; - p_priv->flow_control = (cflag &CRTSCTS )? flow_cts: flow_none; + p_priv->flow_control = (cflag &CRTSCTS ) ? flow_cts : flow_none;/* Mark/Space not supported */ tty->termios->c_cflag &= ~CMSPAR ;
@@ -1102,7 +1102,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port) }/* set CTS/RTS handshake etc. */ p_priv->cflag = cflag; - p_priv->flow_control = (cflag &CRTSCTS )? flow_cts: flow_none; + p_priv->flow_control = (cflag &CRTSCTS ) ? flow_cts : flow_none;keyspan_send_setup (port,1 );/* mdelay(100); */
@@ -1709,7 +1709,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, msg.setPrescaler =0xff ; } - msg.lcr = (p_priv->cflag &CSTOPB )?STOPBITS_678_2 :STOPBITS_5678_1 ; + msg.lcr = (p_priv->cflag &CSTOPB ) ?STOPBITS_678_2 :STOPBITS_5678_1 ;switch (p_priv->cflag &CSIZE ) {case CS5 : msg.lcr |=USA_DATABITS_5 ;
@@ -1726,7 +1726,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, }if (p_priv->cflag &PARENB ) {/* note USA_PARITY_NONE == 0 */ - msg.lcr |= (p_priv->cflag &PARODD )? + msg.lcr |= (p_priv->cflag &PARODD ) ?USA_PARITY_ODD :USA_PARITY_EVEN ; } msg.setLcr =0xff ;
@@ -1994,7 +1994,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,/* msg.setPrescaler = 0xff; */ } - msg.lcr = (p_priv->cflag &CSTOPB )?STOPBITS_678_2 :STOPBITS_5678_1 ; + msg.lcr = (p_priv->cflag &CSTOPB ) ?STOPBITS_678_2 :STOPBITS_5678_1 ;switch (p_priv->cflag &CSIZE ) {case CS5 : msg.lcr |=USA_DATABITS_5 ;
@@ -2011,7 +2011,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, }if (p_priv->cflag &PARENB ) {/* note USA_PARITY_NONE == 0 */ - msg.lcr |= (p_priv->cflag &PARODD )? + msg.lcr |= (p_priv->cflag &PARODD ) ?USA_PARITY_ODD :USA_PARITY_EVEN ; } msg.setLcr =0xff ;
@@ -2178,7 +2178,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, msg.txMode =TXMODE_BYHAND ; } - msg.lcr = (p_priv->cflag &CSTOPB )?STOPBITS_678_2 :STOPBITS_5678_1 ; + msg.lcr = (p_priv->cflag &CSTOPB ) ?STOPBITS_678_2 :STOPBITS_5678_1 ;switch (p_priv->cflag &CSIZE ) {case CS5 : msg.lcr |=USA_DATABITS_5 ;
@@ -2195,7 +2195,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, }if (p_priv->cflag &PARENB ) {/* note USA_PARITY_NONE == 0 */ - msg.lcr |= (p_priv->cflag &PARODD )? + msg.lcr |= (p_priv->cflag &PARODD ) ?USA_PARITY_ODD :USA_PARITY_EVEN ; }if (p_priv->old_cflag != p_priv->cflag) {
@@ -2322,7 +2322,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial, }if (p_priv->cflag &PARENB ) {/* note USA_PARITY_NONE == 0 */ - msg.lcr |= (p_priv->cflag &PARODD )? + msg.lcr |= (p_priv->cflag &PARODD ) ?USA_PARITY_ODD :USA_PARITY_EVEN ; } msg.setLcr =0xff ;
Signature · 1 line
1.7.2.5
PATCH 3/6 USB: serial: Fixed space around equals.
In reply to Ben MinerdsChanges to conform with checkpatch.sh script. - space around '='. Removed 1 checkpatch.sh error.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/serial/keyspan.c +1 -1
@@ -474,7 +474,7 @@ static void usa28_indat_callback(struct urb *urb) p_priv =usb_get_serial_port_data (port); data = urb->transfer_buffer; - tty =tty_port_tty_get (&port->port); + tty =tty_port_tty_get (&port->port);if (tty && urb->actual_length) {tty_insert_flip_string (tty, data, urb->actual_length);tty_flip_buffer_push (tty);
Signature · 1 line
1.7.2.5
PATCH 4/6 USB: serial: Fixed space near open parenthesis.
In reply to Ben MinerdsChanges to conform with checkpatch.sh script. - space near open parenthesis '('. Removed 2 checkpatch.sh errors.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/serial/keyspan.c +1 -1
@@ -557,7 +557,7 @@ static void usa28_instat_callback(struct urb *urb) p_priv->dcd_state = ((msg->dcd) ?1 :0 ); p_priv->ri_state = ((msg->ri) ?1 :0 ); -if ( old_dcd_state != p_priv->dcd_state && old_dcd_state) { +if (old_dcd_state != p_priv->dcd_state && old_dcd_state) { tty =tty_port_tty_get (&port->port);if (tty && !C_CLOCAL (tty))tty_hangup (tty);
Signature · 1 line
1.7.2.5
PATCH 5/6 USB: serial: Removed trailing whitespace.
In reply to Ben MinerdsChanges to conform with checkpatch.sh script. - trailing whitespace. Removed 1 checkpatch.sh error.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/serial/keyspan.c +1 -1
@@ -559,7 +559,7 @@ static void usa28_instat_callback(struct urb *urb)if (old_dcd_state != p_priv->dcd_state && old_dcd_state) { tty =tty_port_tty_get (&port->port); -if (tty && !C_CLOCAL (tty)) +if (tty && !C_CLOCAL (tty))tty_hangup (tty);tty_kref_put (tty); }
Signature · 1 line
1.7.2.5
PATCH 6/6 USB: serial: Removed unrequired parentheses.
In reply to Ben MinerdsChanges to conform with checkpatch.sh script. - return is not a function, parentheses not required. Removed 1 checkpatch.sh error.
Signed-off-by Ben Minerds <[email protected]>
--- drivers/usb/serial/keyspan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/serial/keyspan.c +1 -1
@@ -1240,7 +1240,7 @@ static int keyspan_fake_startup(struct usb_serial *serial)if (request_ihex_firmware (&fw, fw_name, &serial->dev->dev)) {dev_err (&serial->dev->dev,"Required keyspan firmware image (%s) unavailable.\n" , fw_name); -return (1 ); +return 1 ; }dbg ("Uploading Keyspan %s firmware." , fw_name);
Signature · 1 line
1.7.2.5
Greg KH
maintainerQuoted 8 lines · Ben Minerds
Removed various
checkpatch.shwarnings and errors. Split patch by warning/error type. Corrected line wraps in emails.Signed-off-by Ben Minerds <[email protected]>--- drivers/usb/serial/keyspan.c | 106 +++++++++++++++++++++--------------------- 1 files changed, 53 insertions(+), 53 deletions(-)
I don't understand, is this 0/6 patch a "real" patch that should be applied, or is it just a summary of the 1-6 patches all together?
Normally the 0/6 email is a text summary, and maybe the diffstat of the whole patchset. But not a patch itself with a signed-off-by line.
confused,
greg k-h
Quoted 1 line · Ben Minerds
Removed various
checkpatch.shwarnings and errors.
You've meant chekpatch.pl, right?
Quoted 4 lines
Split patch by warning/error type.
Corrected line wraps in emails.Signed-off-by Ben Minerds <[email protected]>
This 0/6 also confuses me -- like Greg have said the 0/n mail should not contain any diff, just a summary -- but all the other patches look good to me as they are only whitespace changes -- if only there was a diff tool that understood C and compared stream of C tokens rather then a plain text file.
Signature · 4 lines
Best regards, _ _ .o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o ..o | Computer Science, Michał “mina86” Nazarewicz (o o) ooo +----<email/xmpp: [email protected]>--------------ooO--(_)--Ooo--