Commit e04a088b authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dmitry Torokhov

Input: axp20x-pek - switch to SYSTEM_SLEEP_PM_OPS() and pm_sleep_ptr()

SET_SYSTEM_SLEEP_PM_OPS() is deprecated as it requires explicit protection
against unused function warnings.  The new combination of pm_sleep_ptr()
and SYSTEM_SLEEP_PM_OPS() allows the compiler to see the functions,
thus suppressing the warning, but still allowing the unused code to be
removed. Thus also drop the __maybe_unused markings.  Here the
additional .resume_noirq callback is protected with pm_sleep_ptr(). This
isn't strictly necessary but is done for consistency with the other
callbacks.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230114171620.42891-3-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 28bbeca2
...@@ -336,7 +336,7 @@ static int axp20x_pek_probe(struct platform_device *pdev) ...@@ -336,7 +336,7 @@ static int axp20x_pek_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __maybe_unused axp20x_pek_suspend(struct device *dev) static int axp20x_pek_suspend(struct device *dev)
{ {
struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
...@@ -355,7 +355,7 @@ static int __maybe_unused axp20x_pek_suspend(struct device *dev) ...@@ -355,7 +355,7 @@ static int __maybe_unused axp20x_pek_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused axp20x_pek_resume(struct device *dev) static int axp20x_pek_resume(struct device *dev)
{ {
struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
...@@ -389,10 +389,8 @@ static int __maybe_unused axp20x_pek_resume_noirq(struct device *dev) ...@@ -389,10 +389,8 @@ static int __maybe_unused axp20x_pek_resume_noirq(struct device *dev)
} }
static const struct dev_pm_ops axp20x_pek_pm_ops = { static const struct dev_pm_ops axp20x_pek_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(axp20x_pek_suspend, axp20x_pek_resume) SYSTEM_SLEEP_PM_OPS(axp20x_pek_suspend, axp20x_pek_resume)
#ifdef CONFIG_PM_SLEEP .resume_noirq = pm_sleep_ptr(axp20x_pek_resume_noirq),
.resume_noirq = axp20x_pek_resume_noirq,
#endif
}; };
static const struct platform_device_id axp_pek_id_match[] = { static const struct platform_device_id axp_pek_id_match[] = {
...@@ -413,7 +411,7 @@ static struct platform_driver axp20x_pek_driver = { ...@@ -413,7 +411,7 @@ static struct platform_driver axp20x_pek_driver = {
.id_table = axp_pek_id_match, .id_table = axp_pek_id_match,
.driver = { .driver = {
.name = "axp20x-pek", .name = "axp20x-pek",
.pm = &axp20x_pek_pm_ops, .pm = pm_sleep_ptr(&axp20x_pek_pm_ops),
.dev_groups = axp20x_groups, .dev_groups = axp20x_groups,
}, },
}; };
......
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