OSDN Git Service

Input: iqs626a - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 2 Jan 2023 18:17:42 +0000 (18:17 +0000)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Jan 2023 04:25:21 +0000 (20:25 -0800)
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: Jeff LaBundy <jeff@labundy.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-10-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/misc/iqs626a.c

index 23b5dd9..4727e6b 100644 (file)
@@ -1712,7 +1712,7 @@ static int iqs626_probe(struct i2c_client *client)
        return error;
 }
 
-static int __maybe_unused iqs626_suspend(struct device *dev)
+static int iqs626_suspend(struct device *dev)
 {
        struct iqs626_private *iqs626 = dev_get_drvdata(dev);
        struct i2c_client *client = iqs626->client;
@@ -1771,7 +1771,7 @@ err_irq:
        return error;
 }
 
-static int __maybe_unused iqs626_resume(struct device *dev)
+static int iqs626_resume(struct device *dev)
 {
        struct iqs626_private *iqs626 = dev_get_drvdata(dev);
        struct i2c_client *client = iqs626->client;
@@ -1818,7 +1818,7 @@ err_irq:
        return error;
 }
 
-static SIMPLE_DEV_PM_OPS(iqs626_pm, iqs626_suspend, iqs626_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(iqs626_pm, iqs626_suspend, iqs626_resume);
 
 static const struct of_device_id iqs626_of_match[] = {
        { .compatible = "azoteq,iqs626a" },
@@ -1830,7 +1830,7 @@ static struct i2c_driver iqs626_i2c_driver = {
        .driver = {
                .name = "iqs626a",
                .of_match_table = iqs626_of_match,
-               .pm = &iqs626_pm,
+               .pm = pm_sleep_ptr(&iqs626_pm),
        },
        .probe_new = iqs626_probe,
 };