Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-08 15:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

serial: liteuart: Remove a copy of UART id in private structure

Browse Source 
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>
This commit is contained in:
Andy Shevchenko 2023-01-23 21:26:04 +02:00 committed by Greg Kroah-Hartman
parent 297cb3f0b9
commit 646b4cd990
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/tty/serial/liteuart.c
View File

@ -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 @@ static int liteuart_probe(struct platform_device *pdev)
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;
}