Commit 90208b31 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dmitry Torokhov

Input: stmfts - switch to SYSTEM_SLEEP_/RUNTIME_PM_OPS() and pm_ptr()

SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated as
they require explicit protection against unused function warnings.
The new combination of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/
RUNTIME_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: Andi Shyti <andi@etezian.org>
Link: https://lore.kernel.org/r/20230114171620.42891-7-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 452fcd2d
...@@ -742,7 +742,7 @@ static void stmfts_remove(struct i2c_client *client) ...@@ -742,7 +742,7 @@ static void stmfts_remove(struct i2c_client *client)
pm_runtime_disable(&client->dev); pm_runtime_disable(&client->dev);
} }
static int __maybe_unused stmfts_runtime_suspend(struct device *dev) static int stmfts_runtime_suspend(struct device *dev)
{ {
struct stmfts_data *sdata = dev_get_drvdata(dev); struct stmfts_data *sdata = dev_get_drvdata(dev);
int ret; int ret;
...@@ -754,7 +754,7 @@ static int __maybe_unused stmfts_runtime_suspend(struct device *dev) ...@@ -754,7 +754,7 @@ static int __maybe_unused stmfts_runtime_suspend(struct device *dev)
return ret; return ret;
} }
static int __maybe_unused stmfts_runtime_resume(struct device *dev) static int stmfts_runtime_resume(struct device *dev)
{ {
struct stmfts_data *sdata = dev_get_drvdata(dev); struct stmfts_data *sdata = dev_get_drvdata(dev);
int ret; int ret;
...@@ -766,7 +766,7 @@ static int __maybe_unused stmfts_runtime_resume(struct device *dev) ...@@ -766,7 +766,7 @@ static int __maybe_unused stmfts_runtime_resume(struct device *dev)
return ret; return ret;
} }
static int __maybe_unused stmfts_suspend(struct device *dev) static int stmfts_suspend(struct device *dev)
{ {
struct stmfts_data *sdata = dev_get_drvdata(dev); struct stmfts_data *sdata = dev_get_drvdata(dev);
...@@ -775,7 +775,7 @@ static int __maybe_unused stmfts_suspend(struct device *dev) ...@@ -775,7 +775,7 @@ static int __maybe_unused stmfts_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused stmfts_resume(struct device *dev) static int stmfts_resume(struct device *dev)
{ {
struct stmfts_data *sdata = dev_get_drvdata(dev); struct stmfts_data *sdata = dev_get_drvdata(dev);
...@@ -783,8 +783,8 @@ static int __maybe_unused stmfts_resume(struct device *dev) ...@@ -783,8 +783,8 @@ static int __maybe_unused stmfts_resume(struct device *dev)
} }
static const struct dev_pm_ops stmfts_pm_ops = { static const struct dev_pm_ops stmfts_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(stmfts_suspend, stmfts_resume) SYSTEM_SLEEP_PM_OPS(stmfts_suspend, stmfts_resume)
SET_RUNTIME_PM_OPS(stmfts_runtime_suspend, stmfts_runtime_resume, NULL) RUNTIME_PM_OPS(stmfts_runtime_suspend, stmfts_runtime_resume, NULL)
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
...@@ -805,7 +805,7 @@ static struct i2c_driver stmfts_driver = { ...@@ -805,7 +805,7 @@ static struct i2c_driver stmfts_driver = {
.driver = { .driver = {
.name = STMFTS_DEV_NAME, .name = STMFTS_DEV_NAME,
.of_match_table = of_match_ptr(stmfts_of_match), .of_match_table = of_match_ptr(stmfts_of_match),
.pm = &stmfts_pm_ops, .pm = pm_ptr(&stmfts_pm_ops),
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .probe_type = PROBE_PREFER_ASYNCHRONOUS,
}, },
.probe_new = stmfts_probe, .probe_new = stmfts_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