Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1667918

Re: [PATCH v2] serial: Delete dead code for CIR serial ports

Show all headers | View raw

On Fri, Jun 16, 2017 at 6:17 PM, Matthias Brugger <mbrugger@suse.com> wrote:
> Commit e4fda3a04275 ("serial: don't register CIR serial ports") adds a
> check for PORT_8250_CIR to serial8250_register_8250_port(). But the code
> isn't needed as the function never takes the branch when the port is CIR
> serial port.
>
> This patch deletes the dead code.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

One comment below.

>
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
> ---
>  drivers/tty/serial/8250/8250_core.c | 23 ++++++-----------------
>  1 file changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
> index 1aab3010fbfa..b5def356af63 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -1043,24 +1043,13 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
>                 if (up->dl_write)
>                         uart->dl_write = up->dl_write;
>
> -               if (uart->port.type != PORT_8250_CIR) {
> -                       if (serial8250_isa_config != NULL)
> -                               serial8250_isa_config(0, &uart->port,
> -                                               &uart->capabilities);
> -
> -                       ret = uart_add_one_port(&serial8250_reg,
> -                                               &uart->port);
> -                       if (ret == 0)
> -                               ret = uart->port.line;
> -               } else {
> -                       dev_info(uart->port.dev,
> -                               "skipping CIR port at 0x%lx / 0x%llx, IRQ %d\n",
> -                               uart->port.iobase,
> -                               (unsigned long long)uart->port.mapbase,
> -                               uart->port.irq);
> +               if (serial8250_isa_config != NULL)
> +                       serial8250_isa_config(0, &uart->port,
> +                                       &uart->capabilities);

If it exceeds 80 by ~3 characters it's still okay from my p.o.v.
Nevertheless, it's your choice.

>
> -                       ret = 0;
> -               }
> +               ret = uart_add_one_port(&serial8250_reg, &uart->port);
> +               if (ret == 0)
> +                       ret = uart->port.line;
>         }
>         mutex_unlock(&serial_mutex);
>
> --
> 2.12.3
>



-- 
With Best Regards,
Andy Shevchenko

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2] serial: Delete dead code for CIR serial ports Matthias Brugger <mbrugger@suse.com> - 2017-06-16 17:20 +0200
  Re: [PATCH v2] serial: Delete dead code for CIR serial ports Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-16 19:40 +0200

csiph-web