samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Claudiu Beznea
2025-06-11 08:05:50 +03:00
committed by Greg Kroah-Hartman
parent f8f07ea231
commit 9d50955bf2
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/tty/serial/sh-sci.c
View File

@@ -3043,10 +3043,6 @@ static int sci_init_single(struct platform_device *dev,
ret = sci_init_clocks(sci_port, &dev->dev); ret = sci_init_clocks(sci_port, &dev->dev);
if (ret < 0) if (ret < 0)
return ret; return ret;
port->dev = &dev->dev;
pm_runtime_enable(&dev->dev);
} }
port->type = p->type; port->type = p->type;
@@ -3076,11 +3072,6 @@ static int sci_init_single(struct platform_device *dev,
return 0; return 0;
} }
static void sci_cleanup_single(struct sci_port *port)
{
pm_runtime_disable(port->port.dev);
}
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || \ #if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || \
defined(CONFIG_SERIAL_SH_SCI_EARLYCON) defined(CONFIG_SERIAL_SH_SCI_EARLYCON)
static void serial_console_putchar(struct uart_port *port, unsigned char ch) static void serial_console_putchar(struct uart_port *port, unsigned char ch)
@@ -3250,8 +3241,6 @@ static int sci_remove(struct platform_device *dev)
sci_ports_in_use &= ~BIT(port->port.line); sci_ports_in_use &= ~BIT(port->port.line);
uart_remove_one_port(&sci_uart_driver, &port->port); uart_remove_one_port(&sci_uart_driver, &port->port);
sci_cleanup_single(port);
if (port->port.fifosize > 1) if (port->port.fifosize > 1)
device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger); device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger);
if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF) if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF)
@@ -3414,6 +3403,11 @@ static int sci_probe_single(struct platform_device *dev,
if (ret) if (ret)
return 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); sciport->gpios = mctrl_gpio_init(&sciport->port, 0);
if (IS_ERR(sciport->gpios)) if (IS_ERR(sciport->gpios))
return PTR_ERR(sciport->gpios); return PTR_ERR(sciport->gpios);
@@ -3427,13 +3421,7 @@ static int sci_probe_single(struct platform_device *dev,
sciport->port.flags |= UPF_HARD_FLOW; sciport->port.flags |= UPF_HARD_FLOW;
} }
ret = uart_add_one_port(&sci_uart_driver, &sciport->port); return uart_add_one_port(&sci_uart_driver, &sciport->port);
if (ret) {
sci_cleanup_single(sciport);
return ret;
}
return 0;
} }
static int sci_probe(struct platform_device *dev) static int sci_probe(struct platform_device *dev)