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

Input: ads7846 - 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>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-32-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 458d7343
...@@ -944,7 +944,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle) ...@@ -944,7 +944,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __maybe_unused ads7846_suspend(struct device *dev) static int ads7846_suspend(struct device *dev)
{ {
struct ads7846 *ts = dev_get_drvdata(dev); struct ads7846 *ts = dev_get_drvdata(dev);
...@@ -966,7 +966,7 @@ static int __maybe_unused ads7846_suspend(struct device *dev) ...@@ -966,7 +966,7 @@ static int __maybe_unused ads7846_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused ads7846_resume(struct device *dev) static int ads7846_resume(struct device *dev)
{ {
struct ads7846 *ts = dev_get_drvdata(dev); struct ads7846 *ts = dev_get_drvdata(dev);
...@@ -988,7 +988,7 @@ static int __maybe_unused ads7846_resume(struct device *dev) ...@@ -988,7 +988,7 @@ static int __maybe_unused ads7846_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); static DEFINE_SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume);
static int ads7846_setup_pendown(struct spi_device *spi, static int ads7846_setup_pendown(struct spi_device *spi,
struct ads7846 *ts, struct ads7846 *ts,
...@@ -1421,7 +1421,7 @@ static void ads7846_remove(struct spi_device *spi) ...@@ -1421,7 +1421,7 @@ static void ads7846_remove(struct spi_device *spi)
static struct spi_driver ads7846_driver = { static struct spi_driver ads7846_driver = {
.driver = { .driver = {
.name = "ads7846", .name = "ads7846",
.pm = &ads7846_pm, .pm = pm_sleep_ptr(&ads7846_pm),
.of_match_table = of_match_ptr(ads7846_dt_ids), .of_match_table = of_match_ptr(ads7846_dt_ids),
}, },
.probe = ads7846_probe, .probe = ads7846_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