Commit 239f1120 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarClaudiu 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eaeee422

drivers/tty/serial/sh-sci.c

+6 −18
Original line number Diff line number Diff line
@@ -3056,10 +3056,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;
@@ -3086,11 +3082,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, unsigned char ch)
@@ -3260,8 +3251,6 @@ static void 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)
@@ -3425,6 +3414,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);
@@ -3438,13 +3432,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)