serial: sh-sci: Move runtime PM enable to sci_probe_single()

commit 239f11209e5f282e16f5241b99256e25dd0614b6 upstream.

Relocate the runtime PM enable operation to sci_probe_single(). This change
prepares the codebase for upcoming fixes.

While at it, replace the existing logic with a direct call to
devm_pm_runtime_enable() and remove sci_cleanup_single(). The
devm_pm_runtime_enable() function automatically handles disabling runtime
PM during driver removal.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://lore.kernel.org/r/20250116182249.3828577-3-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index f598135ea75c2ca262b1d16c7132381b19b17682..4ce6dd7c40928fe90257184f1814c974ae792006 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -3021,10 +3021,6 @@ static int sci_init_single(struct platform_device *dev,
                ret = sci_init_clocks(sci_port, &dev->dev);
                if (ret < 0)
                        return ret;
-
-               port->dev = &dev->dev;
-
-               pm_runtime_enable(&dev->dev);
        }
 
        port->type              = p->type;
@@ -3054,11 +3050,6 @@ static int sci_init_single(struct platform_device *dev,
        return 0;
 }
 
-static void sci_cleanup_single(struct sci_port *port)
-{
-       pm_runtime_disable(port->port.dev);
-}
-
 #if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || \
     defined(CONFIG_SERIAL_SH_SCI_EARLYCON)
 static void serial_console_putchar(struct uart_port *port, int ch)
@@ -3216,8 +3207,6 @@ static int sci_remove(struct platform_device *dev)
        sci_ports_in_use &= ~BIT(port->port.line);
        uart_remove_one_port(&sci_uart_driver, &port->port);
 
-       sci_cleanup_single(port);
-
        if (port->port.fifosize > 1)
                device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger);
        if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF)
@@ -3348,6 +3337,11 @@ static int sci_probe_single(struct platform_device *dev,
        if (ret)
                return ret;
 
+       sciport->port.dev = &dev->dev;
+       ret = devm_pm_runtime_enable(&dev->dev);
+       if (ret)
+               return ret;
+
        sciport->gpios = mctrl_gpio_init(&sciport->port, 0);
        if (IS_ERR(sciport->gpios))
                return PTR_ERR(sciport->gpios);
@@ -3361,13 +3355,7 @@ static int sci_probe_single(struct platform_device *dev,
                sciport->port.flags |= UPF_HARD_FLOW;
        }
 
-       ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
-       if (ret) {
-               sci_cleanup_single(sciport);
-               return ret;
-       }
-
-       return 0;
+       return uart_add_one_port(&sci_uart_driver, &sciport->port);
 }
 
 static int sci_probe(struct platform_device *dev)