Commit 68c341c8 authored by Raphael Gallais-Pou's avatar Raphael Gallais-Pou Committed by Greg Kroah-Hartman

serial: st-asc: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()

Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Signed-off-by: default avatarRaphael Gallais-Pou <rgallaispou@gmail.com>
Link: https://lore.kernel.org/r/20240716180010.126987-1-rgallaispou@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8400291e
...@@ -808,7 +808,6 @@ static void asc_serial_remove(struct platform_device *pdev) ...@@ -808,7 +808,6 @@ static void asc_serial_remove(struct platform_device *pdev)
uart_remove_one_port(&asc_uart_driver, port); uart_remove_one_port(&asc_uart_driver, port);
} }
#ifdef CONFIG_PM_SLEEP
static int asc_serial_suspend(struct device *dev) static int asc_serial_suspend(struct device *dev)
{ {
struct uart_port *port = dev_get_drvdata(dev); struct uart_port *port = dev_get_drvdata(dev);
...@@ -823,8 +822,6 @@ static int asc_serial_resume(struct device *dev) ...@@ -823,8 +822,6 @@ static int asc_serial_resume(struct device *dev)
return uart_resume_port(&asc_uart_driver, port); return uart_resume_port(&asc_uart_driver, port);
} }
#endif /* CONFIG_PM_SLEEP */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#ifdef CONFIG_SERIAL_ST_ASC_CONSOLE #ifdef CONFIG_SERIAL_ST_ASC_CONSOLE
...@@ -932,16 +929,15 @@ static struct uart_driver asc_uart_driver = { ...@@ -932,16 +929,15 @@ static struct uart_driver asc_uart_driver = {
.cons = ASC_SERIAL_CONSOLE, .cons = ASC_SERIAL_CONSOLE,
}; };
static const struct dev_pm_ops asc_serial_pm_ops = { static DEFINE_SIMPLE_DEV_PM_OPS(asc_serial_pm_ops, asc_serial_suspend,
SET_SYSTEM_SLEEP_PM_OPS(asc_serial_suspend, asc_serial_resume) asc_serial_resume);
};
static struct platform_driver asc_serial_driver = { static struct platform_driver asc_serial_driver = {
.probe = asc_serial_probe, .probe = asc_serial_probe,
.remove_new = asc_serial_remove, .remove_new = asc_serial_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.pm = &asc_serial_pm_ops, .pm = pm_sleep_ptr(&asc_serial_pm_ops),
.of_match_table = of_match_ptr(asc_match), .of_match_table = of_match_ptr(asc_match),
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment