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

Input: surface3_spi - 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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Stephen Just <stephenjust@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-62-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 7c8d436d
...@@ -369,7 +369,7 @@ static int surface3_spi_probe(struct spi_device *spi) ...@@ -369,7 +369,7 @@ static int surface3_spi_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __maybe_unused surface3_spi_suspend(struct device *dev) static int surface3_spi_suspend(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct surface3_ts_data *data = spi_get_drvdata(spi); struct surface3_ts_data *data = spi_get_drvdata(spi);
...@@ -381,7 +381,7 @@ static int __maybe_unused surface3_spi_suspend(struct device *dev) ...@@ -381,7 +381,7 @@ static int __maybe_unused surface3_spi_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused surface3_spi_resume(struct device *dev) static int surface3_spi_resume(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct surface3_ts_data *data = spi_get_drvdata(spi); struct surface3_ts_data *data = spi_get_drvdata(spi);
...@@ -393,9 +393,9 @@ static int __maybe_unused surface3_spi_resume(struct device *dev) ...@@ -393,9 +393,9 @@ static int __maybe_unused surface3_spi_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(surface3_spi_pm_ops, static DEFINE_SIMPLE_DEV_PM_OPS(surface3_spi_pm_ops,
surface3_spi_suspend, surface3_spi_suspend,
surface3_spi_resume); surface3_spi_resume);
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static const struct acpi_device_id surface3_spi_acpi_match[] = { static const struct acpi_device_id surface3_spi_acpi_match[] = {
...@@ -409,7 +409,7 @@ static struct spi_driver surface3_spi_driver = { ...@@ -409,7 +409,7 @@ static struct spi_driver surface3_spi_driver = {
.driver = { .driver = {
.name = "Surface3-spi", .name = "Surface3-spi",
.acpi_match_table = ACPI_PTR(surface3_spi_acpi_match), .acpi_match_table = ACPI_PTR(surface3_spi_acpi_match),
.pm = &surface3_spi_pm_ops, .pm = pm_sleep_ptr(&surface3_spi_pm_ops),
}, },
.probe = surface3_spi_probe, .probe = surface3_spi_probe,
}; };
......
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