Input: max8997_haptic - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()

SIMPLE_DEV_PM_OPS() is deprecated as it requires explicit protection
against unused function warnings.  The new combination of pm_sleep_ptr()
and DEFINE_SIMPLE_DEV_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.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-14-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2023-01-02 18:17:46 +00:00 committed by Dmitry Torokhov
parent 1bf9484446
commit a66640c66e

View File

@ -366,7 +366,7 @@ static int max8997_haptic_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __maybe_unused max8997_haptic_suspend(struct device *dev) static int max8997_haptic_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct max8997_haptic *chip = platform_get_drvdata(pdev); struct max8997_haptic *chip = platform_get_drvdata(pdev);
@ -376,7 +376,8 @@ static int __maybe_unused max8997_haptic_suspend(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL); static DEFINE_SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops,
max8997_haptic_suspend, NULL);
static const struct platform_device_id max8997_haptic_id[] = { static const struct platform_device_id max8997_haptic_id[] = {
{ "max8997-haptic", 0 }, { "max8997-haptic", 0 },
@ -387,7 +388,7 @@ MODULE_DEVICE_TABLE(platform, max8997_haptic_id);
static struct platform_driver max8997_haptic_driver = { static struct platform_driver max8997_haptic_driver = {
.driver = { .driver = {
.name = "max8997-haptic", .name = "max8997-haptic",
.pm = &max8997_haptic_pm_ops, .pm = pm_sleep_ptr(&max8997_haptic_pm_ops),
}, },
.probe = max8997_haptic_probe, .probe = max8997_haptic_probe,
.remove = max8997_haptic_remove, .remove = max8997_haptic_remove,