serial: 8250_dw: Drop PM ifdeffery
Subsystems (3)
Andy Shevchenko
reviewerPATCH v2 1/1 serial: 8250_dw: Drop PM ifdeffery
Drop CONFIG_PM and CONFIG_PM_SLEEP ifdeffery while converting dw8250_pm_ops to use new PM macros. Since we are using runtime PM, wrap dw8250_pm_ops into pm_ptr().
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: wrapped dw8250_pm_ops into pm_ptr() macro (Paul)
drivers/tty/serial/8250/8250_dw.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/tty/serial/8250/8250_dw.c +3 -7
@@ -743,7 +743,6 @@ static int dw8250_remove(struct platform_device *pdev)return 0 ; } -#ifdef CONFIG_PM_SLEEP static int dw8250_suspend (struct device *dev) {struct dw8250_data *data =dev_get_drvdata (dev);
@@ -775,9 +774,7 @@ static int dw8250_resume(struct device *dev)return 0 ; } -#endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_PM static int dw8250_runtime_suspend (struct device *dev) {struct dw8250_data *data =dev_get_drvdata (dev);
@@ -808,11 +805,10 @@ static int dw8250_runtime_resume(struct device *dev)/* TODO: Check if it needs more than it's done in serial8250_console_restore() */ return 0 ; } -#endif static const struct dev_pm_ops dw8250_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(dw8250_suspend, dw8250_resume) -SET_RUNTIME_PM_OPS (dw8250_runtime_suspend, dw8250_runtime_resume,NULL ) + SYSTEM_SLEEP_PM_OPS(dw8250_suspend, dw8250_resume) +RUNTIME_PM_OPS (dw8250_runtime_suspend, dw8250_runtime_resume,NULL ) };static const struct dw8250_platform_data dw8250_dw_apb = {
@@ -870,7 +866,7 @@ MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);static struct platform_driver dw8250_platform_driver = { .driver = { .name ="dw-apb-uart" , - .pm = &dw8250_pm_ops, + .pm =pm_ptr (&dw8250_pm_ops), .of_match_table = dw8250_of_match, .acpi_match_table = dw8250_acpi_match, },
Signature · 1 line
2.35.1
Quoted 5 lines · Andy Shevchenko
Drop
CONFIG_PMandCONFIG_PM_SLEEPifdeffery while convertingdw8250_pm_opsto use new PM macros. Since we are using runtime PM, wrapdw8250_pm_opsintopm_ptr().Signed-off-by Andy Shevchenko <[email protected]>
Reviewed-by Ilpo Järvinen <[email protected]>
Signature · 1 line
i.
Quoted 51 lines
---
v2: wrappeddw8250_pm_opsintopm_ptr()macro (Paul)drivers/tty/serial/8250/8250_dw.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)drivers/tty/serial/8250/8250_dw.c +3
-7@@ -743,7 +743,6 @@ static int dw8250_remove(struct platform_device *pdev)return 0 ; } -#ifdef CONFIG_PM_SLEEP static int dw8250_suspend (struct device *dev) {struct dw8250_data *data =dev_get_drvdata (dev);@@ -775,9 +774,7 @@ static int dw8250_resume(struct device *dev)return 0 ; } -#endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_PM static int dw8250_runtime_suspend (struct device *dev) {struct dw8250_data *data =dev_get_drvdata (dev);@@ -808,11 +805,10 @@ static int dw8250_runtime_resume(struct device *dev)/* TODO: Check if it needs more than it's done in serial8250_console_restore() */ return 0 ; } -#endif static const struct dev_pm_ops dw8250_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(dw8250_suspend, dw8250_resume) -SET_RUNTIME_PM_OPS (dw8250_runtime_suspend, dw8250_runtime_resume,NULL ) + SYSTEM_SLEEP_PM_OPS(dw8250_suspend, dw8250_resume) +RUNTIME_PM_OPS (dw8250_runtime_suspend, dw8250_runtime_resume,NULL ) };static const struct dw8250_platform_data dw8250_dw_apb = {@@ -870,7 +866,7 @@ MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);static struct platform_driver dw8250_platform_driver = { .driver = { .name ="dw-apb-uart" , - .pm = &dw8250_pm_ops, + .pm =pm_ptr (&dw8250_pm_ops), .of_match_table = dw8250_of_match, .acpi_match_table = dw8250_acpi_match, },