Re: [PATCH v4 09/13] USB: ch341: fix coding style

Johan Hovold
2016-04-29T13:29:58Z

On Fri, Apr 15, 2016 at 11:14:12PM +0200, Grigori Goronzy wrote:
> No functional change. The following adjustments were made to be more in
> line with official coding style and to be more consistent.
>
> Stop mixing tabs and spaces for alignment. Stop putting labels and
> statements into the same line. Use braces consistently for a single
> statement.
>
> v2: drop most changes, particularly indentation changes.
>
> Signed-off-by: Grigori Goronzy <greg@chown.ath.cx>
> ---
> drivers/usb/serial/ch341.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
> index 7ca21a1..f524aa9 100644
> --- a/drivers/usb/serial/ch341.c
> +++ b/drivers/usb/serial/ch341.c
> @@ -133,7 +133,7 @@ static int ch341_control_in(struct usb_device *dev,
> }
>
> static int ch341_init_set_baudrate(struct usb_device *dev,
> - struct ch341_private *priv, unsigned ctrl)
> + struct ch341_private *priv, unsigned ctrl)

This could go into the patch that renamed the function.

> {
> short a;
> int r;
> @@ -187,10 +187,12 @@ static int ch341_get_status(struct usb_device *dev, struct ch341_private *priv)
> spin_lock_irqsave(&priv->lock, flags);
> priv->line_status = (~(*buffer)) & CH341_BITS_MODEM_STAT;
> spin_unlock_irqrestore(&priv->lock, flags);
> - } else
> + } else {
> r = -EPROTO;
> + }
>
> -out: kfree(buffer);
> +out:
> + kfree(buffer);
> return r;
> }
>
> @@ -241,7 +243,8 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
> /* expect 0x9f 0xee */
> r = ch341_get_status(dev, priv);
>
> -out: kfree(buffer);
> +out:
> + kfree(buffer);
> return r;
> }
>
> @@ -265,7 +268,8 @@ static int ch341_port_probe(struct usb_serial_port *port)
> usb_set_serial_port_data(port, priv);
> return 0;
>
> -error: kfree(priv);
> +error:
> + kfree(priv);
> return r;
> }
>
> @@ -479,7 +483,7 @@ static int ch341_tiocmset(struct tty_struct *tty,
> }
>
> static void ch341_update_line_status(struct usb_serial_port *port,
> - unsigned char *data, size_t len)
> + unsigned char *data, size_t len)

This chunk isn't really needed (and is inconsistent with your commit
message).

> {
> struct ch341_private *priv = usb_get_serial_port_data(port);
> struct tty_struct *tty;
> @@ -600,7 +604,7 @@ static struct usb_serial_driver ch341_device = {
> .id_table = id_table,
> .num_ports = 1,
> .open = ch341_open,
> - .dtr_rts = ch341_dtr_rts,
> + .dtr_rts = ch341_dtr_rts,

How about fixing all the entries to use only tabs to align the RHS
instead?

> .carrier_raised = ch341_carrier_raised,
> .close = ch341_close,
> .set_termios = ch341_set_termios,

Thanks,
Johan