Input: zinitix - 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: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230102181842.718010-69-jic23@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
dc69e98a55
commit
61df952bfd
@@ -562,7 +562,7 @@ static int zinitix_ts_probe(struct i2c_client *client)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __maybe_unused zinitix_suspend(struct device *dev)
|
static int zinitix_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct i2c_client *client = to_i2c_client(dev);
|
struct i2c_client *client = to_i2c_client(dev);
|
||||||
struct bt541_ts_data *bt541 = i2c_get_clientdata(client);
|
struct bt541_ts_data *bt541 = i2c_get_clientdata(client);
|
||||||
@@ -577,7 +577,7 @@ static int __maybe_unused zinitix_suspend(struct device *dev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __maybe_unused zinitix_resume(struct device *dev)
|
static int zinitix_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
struct i2c_client *client = to_i2c_client(dev);
|
struct i2c_client *client = to_i2c_client(dev);
|
||||||
struct bt541_ts_data *bt541 = i2c_get_clientdata(client);
|
struct bt541_ts_data *bt541 = i2c_get_clientdata(client);
|
||||||
@@ -593,7 +593,7 @@ static int __maybe_unused zinitix_resume(struct device *dev)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SIMPLE_DEV_PM_OPS(zinitix_pm_ops, zinitix_suspend, zinitix_resume);
|
static DEFINE_SIMPLE_DEV_PM_OPS(zinitix_pm_ops, zinitix_suspend, zinitix_resume);
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
#ifdef CONFIG_OF
|
||||||
static const struct of_device_id zinitix_of_match[] = {
|
static const struct of_device_id zinitix_of_match[] = {
|
||||||
@@ -620,7 +620,7 @@ static struct i2c_driver zinitix_ts_driver = {
|
|||||||
.probe_new = zinitix_ts_probe,
|
.probe_new = zinitix_ts_probe,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "Zinitix-TS",
|
.name = "Zinitix-TS",
|
||||||
.pm = &zinitix_pm_ops,
|
.pm = pm_sleep_ptr(&zinitix_pm_ops),
|
||||||
.of_match_table = of_match_ptr(zinitix_of_match),
|
.of_match_table = of_match_ptr(zinitix_of_match),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user