Re: [PATCH] serial: trivial checkpatch fixes in drivers/tty/serial/8250.c

[Simon Glass]

Hi Joe,

On Thu, Jan 19, 2012 at 11:49 AM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> On Thu, 2012-01-19 at 11:37 -0800, Simon Glass wrote:
>> This makes the file checkpatch clean, fixing these warnings:
>
> Some comments...

Thanks for the comments - all addressed I think. Will send a V2.

Regards,
Simon

>
>> This warning remains, since I am not sure how to fix it:
>> error: drivers/tty/serial/8250.c,2929: Macros with complex values should
>>       be enclosed in parenthesis
>
> you can ignore this warning.
>
>> diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
> []
>> @@ -669,7 +669,8 @@ static void disable_rsa(struct uart_8250_port *up)
>>               result = !(mode & UART_RSA_MSR_FIFO);
>>
>>               if (!result) {
>> -
>>                       serial_outp(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
>> +                     serial_outp(up, UART_RSA_MSR, mode
>> +                                     & ~UART_RSA_MSR_FIFO);
>
> If it's really necessary to use 80 columns,
> I'd prefer this sort of change be:
>                        serial_outp(up, UART_RSA_MSR,
>                                    mode & ~UART_RSA_MSR_FIFO);
>
> []
>> @@ -2006,7 +2010,8 @@ static int serial8250_startup(struct uart_port *port)
>>        */
>>       if (!(up->port.flags & UPF_BUGGY_UART) &&
>>           (serial_inp(up, UART_LSR) == 0xff)) {
>> -             printk_ratelimited(KERN_INFO "ttyS%d: LSR safety check engaged!\n",
>> +             printk_ratelimited(KERN_INFO
>
>                pr_info_ratelimited()
>
>
>> @@ -2019,10 +2024,13 @@ static int serial8250_startup(struct uart_port *port)
>>
>>               serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
>>
>> -             fctr = serial_inp(up, UART_FCTR) & ~(UART_FCTR_RX|UART_FCTR_TX);
>> -             serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD | UART_FCTR_RX);
>> +             fctr = serial_inp(up, UART_FCTR) &
>> +                               ~(UART_FCTR_RX | UART_FCTR_TX);
>> +             serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD |
>> +                         UART_FCTR_RX);
>
> I think it's better to have all the or's
> on the same line where possible.
>
>                serial_outp(up, UART_FCTR,
>                            fctr | UART_FCTR_TRGD | UART_FCTR_RX);
>
>
>> @@ -3130,7 +3139,8 @@ static struct platform_device *serial8250_isa_devs;
>>   */
>>  static DEFINE_MUTEX(serial_mutex);
>>
>> -static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port *port)
>> +static struct uart_8250_port *serial8250_find_match_or_unused(
>> +                                             struct uart_port *port)
>
> It might be better to use
>
> static struct uart_8250_port *
> serial8250_find_match_or_unused(struct uart_port *port)
> {
>> @ -3345,10 +3352,12 @@ MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
>>       " (unsafe)");
>>
>>  module_param(nr_uarts, uint, 0644);
>> -MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
>> +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" \
>> +              __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
>
> Broken.
>
> Don't use line continuations with whitespace on the next line.
> Better not use line continations at all except in #defines
>
>
>>  module_param(skip_txen_test, uint, 0644);
>> -MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
>> +MODULE_PARM_DESC(skip_txen_test, \
>> +             "Skip checking for the TXEN bug at init time");
>
> Useless line continuation.
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/