]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
serial: st-asc: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
authorRaphael Gallais-Pou <rgallaispou@gmail.com>
Tue, 16 Jul 2024 18:00:10 +0000 (20:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Jul 2024 10:32:25 +0000 (12:32 +0200)
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: Raphael Gallais-Pou <rgallaispou@gmail.com>
Link: https://lore.kernel.org/r/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/st-asc.c

index f91753a40a69b5684e9688b03bdf3dc59a683b8f..8aea59f8ca13dac6fd7ee927dea1c59a66d19abe 100644 (file)
@@ -808,7 +808,6 @@ static void asc_serial_remove(struct platform_device *pdev)
        uart_remove_one_port(&asc_uart_driver, port);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int asc_serial_suspend(struct device *dev)
 {
        struct uart_port *port = dev_get_drvdata(dev);
@@ -823,8 +822,6 @@ static int asc_serial_resume(struct device *dev)
        return uart_resume_port(&asc_uart_driver, port);
 }
 
-#endif /* CONFIG_PM_SLEEP */
-
 /*----------------------------------------------------------------------*/
 
 #ifdef CONFIG_SERIAL_ST_ASC_CONSOLE
@@ -932,16 +929,15 @@ static struct uart_driver asc_uart_driver = {
        .cons           = ASC_SERIAL_CONSOLE,
 };
 
-static const struct dev_pm_ops asc_serial_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(asc_serial_suspend, asc_serial_resume)
-};
+static DEFINE_SIMPLE_DEV_PM_OPS(asc_serial_pm_ops, asc_serial_suspend,
+                                                  asc_serial_resume);
 
 static struct platform_driver asc_serial_driver = {
        .probe          = asc_serial_probe,
        .remove_new     = asc_serial_remove,
        .driver = {
                .name   = DRIVER_NAME,
-               .pm     = &asc_serial_pm_ops,
+               .pm     = pm_sleep_ptr(&asc_serial_pm_ops),
                .of_match_table = of_match_ptr(asc_match),
        },
 };