[PATCH] input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Triet Hoang <[email protected]>
| Newsgroups | org.kernel.vger.linux-input,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Convert deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the __maybe_unused annotations from the resume callbacks and reduces kernel size when CONFIG_PM or CONFIG_PM_SLEEP is disabled. Signed-off-by: Triet Hoang <[email protected]> --- drivers/input/misc/88pm80x_onkey.c | 4 ++-- drivers/input/misc/nxp-bbnsm-pwrkey.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c index fee28e537898..d4f344e2bf5c 100644 --- a/drivers/input/misc/88pm80x_onkey.c +++ b/drivers/input/misc/88pm80x_onkey.c @@ -47,7 +47,7 @@ static irqreturn_t pm80x_onkey_handler(int irq, void *data) return IRQ_HANDLED; } -static SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, pm80x_dev_resume); static int pm80x_onkey_probe(struct platform_device *pdev) @@ -138,7 +138,7 @@ static void pm80x_onkey_remove(struct platform_device *pdev) static struct platform_driver pm80x_onkey_driver = { .driver = { .name = "88pm80x-onkey", - .pm = &pm80x_onkey_pm_ops, + .pm = pm_sleep_ptr(&pm80x_onkey_pm_ops), }, .probe = pm80x_onkey_probe, .remove = pm80x_onkey_remove, diff --git a/drivers/input/misc/nxp-bbnsm-pwrkey.c b/drivers/input/misc/nxp-bbnsm-pwrkey.c index 0c7b8f8ef4a5..6af6e0f6395f 100644 --- a/drivers/input/misc/nxp-bbnsm-pwrkey.c +++ b/drivers/input/misc/nxp-bbnsm-pwrkey.c @@ -193,7 +193,7 @@ static void bbnsm_pwrkey_remove(struct platform_device *pdev) device_init_wakeup(&pdev->dev, false); } -static int __maybe_unused bbnsm_pwrkey_suspend(struct device *dev) +static int bbnsm_pwrkey_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct bbnsm_pwrkey *bbnsm = platform_get_drvdata(pdev); @@ -203,7 +203,7 @@ static int __maybe_unused bbnsm_pwrkey_suspend(struct device *dev) return 0; } -static int __maybe_unused bbnsm_pwrkey_resume(struct device *dev) +static int bbnsm_pwrkey_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct bbnsm_pwrkey *bbnsm = platform_get_drvdata(pdev); @@ -213,7 +213,7 @@ static int __maybe_unused bbnsm_pwrkey_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend, bbnsm_pwrkey_resume); static const struct of_device_id bbnsm_pwrkey_ids[] = { @@ -225,7 +225,7 @@ MODULE_DEVICE_TABLE(of, bbnsm_pwrkey_ids); static struct platform_driver bbnsm_pwrkey_driver = { .driver = { .name = "bbnsm_pwrkey", - .pm = &bbnsm_pwrkey_pm_ops, + .pm = pm_sleep_ptr(&bbnsm_pwrkey_pm_ops), .of_match_table = bbnsm_pwrkey_ids, }, .probe = bbnsm_pwrkey_probe, -- 2.53.0