diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-01-23 21:26:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-31 10:59:48 +0100 |
| commit | 646b4cd9909aaf2bfb9e05897e9c3871a7385219 (patch) | |
| tree | 23007b0e730c8f8812363db292c74bed283cd186 /drivers/tty | |
| parent | 297cb3f0b94bfedd781426814f1798a5c5658050 (diff) | |
| download | linux-stable-646b4cd9909aaf2bfb9e05897e9c3871a7385219.tar.gz linux-stable-646b4cd9909aaf2bfb9e05897e9c3871a7385219.tar.bz2 linux-stable-646b4cd9909aaf2bfb9e05897e9c3871a7385219.zip | |
serial: liteuart: Remove a copy of UART id in private structure
The struct liteuart_port keeps tracking of UART ID which is also
saved in the struct uart_port as line member. Drop the former one
and use the latter everywhere.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Gabriel Somlo <gsomlo@gmail.com>
Link: https://lore.kernel.org/r/20230123192604.81452-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/liteuart.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c index 562892395570..80de3a42b67b 100644 --- a/drivers/tty/serial/liteuart.c +++ b/drivers/tty/serial/liteuart.c @@ -46,7 +46,6 @@ struct liteuart_port { struct uart_port port; struct timer_list timer; - u32 id; u8 irq_reg; }; @@ -314,7 +313,6 @@ static int liteuart_probe(struct platform_device *pdev) if (ret) return ret; - uart->id = dev_id; /* values not from device tree */ port->dev = &pdev->dev; port->iotype = UPIO_MEM; @@ -334,7 +332,7 @@ static int liteuart_probe(struct platform_device *pdev) return 0; err_erase_id: - xa_erase(&liteuart_array, uart->id); + xa_erase(&liteuart_array, dev_id); return ret; } @@ -342,10 +340,10 @@ err_erase_id: static int liteuart_remove(struct platform_device *pdev) { struct uart_port *port = platform_get_drvdata(pdev); - struct liteuart_port *uart = to_liteuart_port(port); + unsigned int line = port->line; uart_remove_one_port(&liteuart_driver, port); - xa_erase(&liteuart_array, uart->id); + xa_erase(&liteuart_array, line); return 0; } |