On Wed, Apr 09, 2025 at 08:57:58AM +0200, Jiri Slaby wrote:
On 08. 04. 25, 12:49, Greg Kroah-Hartman wrote:
6.14-stable review patch. If anyone has any objections, please let me know.
From: Sherry Sun sherry.sun@nxp.com
[ Upstream commit 3cc16ae096f164ae0c6b98416c25a01db5f3a529 ]
Most lpuart functions have the parameter struct uart_port *port, but still use the &sport->port to get the uart_port instead of use it directly, let's simply the code logic, directly use this struct instead of covert it from struct sport.
Signed-off-by: Sherry Sun sherry.sun@nxp.com Link: https://lore.kernel.org/r/20250312023904.1343351-3-sherry.sun@nxp.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Stable-dep-of: e98ab45ec518 ("tty: serial: lpuart: only disable CTS instead of overwriting the whole UARTMODIR register") Signed-off-by: Sasha Levin sashal@kernel.org
drivers/tty/serial/fsl_lpuart.c | 213 +++++++++++++++----------------- 1 file changed, 102 insertions(+), 111 deletions(-)
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 1be0bf3b2f50f..f26162d98db62 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c
...
@@ -639,38 +639,36 @@ static void lpuart32_wait_bit_set(struct uart_port *port, unsigned int offset, static int lpuart_poll_init(struct uart_port *port) {
- struct lpuart_port *sport = container_of(port,
struct lpuart_port, port);Hmm, this is confusing, why does this backport embed 9f8fe348ac9544f6855f82565e754bf085d81f88? (And even if it does, without any note?)
Yeah, that is wrong. I think it was because I fixed it up "by hand" to get it to build properly, let me go do this properly by including both commits to keep track of these correctly.
thanks,
greg k-h