[v2,2/2] serial: core: Revert checks for tx runtime PM state

Message ID 20231113080758.30346-2-tony@atomide.com
State New
Headers
Series [v2,1/2] serial: core: Move tty and serdev to be children of serial core port device |

Commit Message

Tony Lindgren Nov. 13, 2023, 8:07 a.m. UTC
  This reverts commit 81a61051e0ce5fd7e09225c0d5985da08c7954a7.

With tty and serdev controller moved to be children of the serial core
port device, runtime PM usage count of the serdev controller now
propagates to the serial hardware controller parent device as expected.

Cc: Maximilian Luz <luzmaximilian@gmail.com>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/tty/serial/serial_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Andy Shevchenko Nov. 21, 2023, 5:21 p.m. UTC | #1
On Mon, Nov 13, 2023 at 10:07:53AM +0200, Tony Lindgren wrote:
> This reverts commit 81a61051e0ce5fd7e09225c0d5985da08c7954a7.
> 
> With tty and serdev controller moved to be children of the serial core
> port device, runtime PM usage count of the serdev controller now
> propagates to the serial hardware controller parent device as expected.

Both are fine to me, FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  

Patch

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -156,7 +156,7 @@  static void __uart_start(struct uart_state *state)
 	 * enabled, serial_port_runtime_resume() calls start_tx() again
 	 * after enabling the device.
 	 */
-	if (!pm_runtime_enabled(port->dev) || pm_runtime_active(port->dev))
+	if (pm_runtime_active(&port_dev->dev))
 		port->ops->start_tx(port);
 	pm_runtime_mark_last_busy(&port_dev->dev);
 	pm_runtime_put_autosuspend(&port_dev->dev);