Commit d4777d0f authored by Paul Cercueil's avatar Paul Cercueil Committed by Wim Van Sebroeck

watchdog: mtk_wdt: Remove #ifdef guards for PM related functions

Use the new DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to
handle the .suspend/.resume callbacks.

These macros allow the suspend and resume functions to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards. Not using #ifdef guards means that the code is
always compiled independently of any Kconfig option, and thanks to that
bugs and regressions are easier to catch.
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220628193449.160585-4-paul@crapouillou.netSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 4ccfb989
...@@ -401,7 +401,6 @@ static int mtk_wdt_probe(struct platform_device *pdev) ...@@ -401,7 +401,6 @@ static int mtk_wdt_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int mtk_wdt_suspend(struct device *dev) static int mtk_wdt_suspend(struct device *dev)
{ {
struct mtk_wdt_dev *mtk_wdt = dev_get_drvdata(dev); struct mtk_wdt_dev *mtk_wdt = dev_get_drvdata(dev);
...@@ -423,7 +422,6 @@ static int mtk_wdt_resume(struct device *dev) ...@@ -423,7 +422,6 @@ static int mtk_wdt_resume(struct device *dev)
return 0; return 0;
} }
#endif
static const struct of_device_id mtk_wdt_dt_ids[] = { static const struct of_device_id mtk_wdt_dt_ids[] = {
{ .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data }, { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data },
...@@ -437,16 +435,14 @@ static const struct of_device_id mtk_wdt_dt_ids[] = { ...@@ -437,16 +435,14 @@ static const struct of_device_id mtk_wdt_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids); MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
static const struct dev_pm_ops mtk_wdt_pm_ops = { static DEFINE_SIMPLE_DEV_PM_OPS(mtk_wdt_pm_ops,
SET_SYSTEM_SLEEP_PM_OPS(mtk_wdt_suspend, mtk_wdt_suspend, mtk_wdt_resume);
mtk_wdt_resume)
};
static struct platform_driver mtk_wdt_driver = { static struct platform_driver mtk_wdt_driver = {
.probe = mtk_wdt_probe, .probe = mtk_wdt_probe,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.pm = &mtk_wdt_pm_ops, .pm = pm_sleep_ptr(&mtk_wdt_pm_ops),
.of_match_table = mtk_wdt_dt_ids, .of_match_table = mtk_wdt_dt_ids,
}, },
}; };
......
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