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

[ Upstream commit 29eac950768a48651e2389f7d3f2ad597f6e58d1 ]

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>
Cc: Jeff LaBundy <jeff@labundy.com>
Reviewed-by: Jeff LaBundy <jeff@labundy.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-9-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Stable-dep-of: 18ab69c8ca56 ("Input: iqs269a - do not poll during suspend or resume")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/input/misc/iqs269a.c b/drivers/input/misc/iqs269a.c
index 1530efd301c24d78893100425a82aed3e5fa03af..07eda05d783ef47db99ac65e8926d0b00fe60366 100644 (file)
--- a/drivers/input/misc/iqs269a.c
+++ b/drivers/input/misc/iqs269a.c
@@ -1687,7 +1687,7 @@ static int iqs269_probe(struct i2c_client *client)
        return error;
 }
 
-static int __maybe_unused iqs269_suspend(struct device *dev)
+static int iqs269_suspend(struct device *dev)
 {
        struct iqs269_private *iqs269 = dev_get_drvdata(dev);
        struct i2c_client *client = iqs269->client;
@@ -1746,7 +1746,7 @@ err_irq:
        return error;
 }
 
-static int __maybe_unused iqs269_resume(struct device *dev)
+static int iqs269_resume(struct device *dev)
 {
        struct iqs269_private *iqs269 = dev_get_drvdata(dev);
        struct i2c_client *client = iqs269->client;
@@ -1793,7 +1793,7 @@ err_irq:
        return error;
 }
 
-static SIMPLE_DEV_PM_OPS(iqs269_pm, iqs269_suspend, iqs269_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(iqs269_pm, iqs269_suspend, iqs269_resume);
 
 static const struct of_device_id iqs269_of_match[] = {
        { .compatible = "azoteq,iqs269a" },
@@ -1805,7 +1805,7 @@ static struct i2c_driver iqs269_i2c_driver = {
        .driver = {
                .name = "iqs269a",
                .of_match_table = iqs269_of_match,
-               .pm = &iqs269_pm,
+               .pm = pm_sleep_ptr(&iqs269_pm),
        },
        .probe_new = iqs269_probe,
 };