UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: qt1050 - 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>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/20221204180841.2211588-11-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2022-12-04 18:08:19 +00:00 committed by Dmitry Torokhov
parent b346200943
commit ffa5d80fa9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/keyboard/qt1050.c
View File

@ -547,7 +547,7 @@ static int qt1050_probe(struct i2c_client *client)
return 0; return 0;
} }
static int __maybe_unused qt1050_suspend(struct device *dev) static int qt1050_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct qt1050_priv *ts = i2c_get_clientdata(client); struct qt1050_priv *ts = i2c_get_clientdata(client);
@ -563,7 +563,7 @@ static int __maybe_unused qt1050_suspend(struct device *dev)
device_may_wakeup(dev) ? 125 : 0); device_may_wakeup(dev) ? 125 : 0);
} }
static int __maybe_unused qt1050_resume(struct device *dev) static int qt1050_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct qt1050_priv *ts = i2c_get_clientdata(client); struct qt1050_priv *ts = i2c_get_clientdata(client);
@ -574,7 +574,7 @@ static int __maybe_unused qt1050_resume(struct device *dev)
return regmap_write(ts->regmap, QT1050_LPMODE, 2); return regmap_write(ts->regmap, QT1050_LPMODE, 2);
} }
static SIMPLE_DEV_PM_OPS(qt1050_pm_ops, qt1050_suspend, qt1050_resume); static DEFINE_SIMPLE_DEV_PM_OPS(qt1050_pm_ops, qt1050_suspend, qt1050_resume);
static const struct of_device_id __maybe_unused qt1050_of_match[] = { static const struct of_device_id __maybe_unused qt1050_of_match[] = {
{ .compatible = "microchip,qt1050", }, { .compatible = "microchip,qt1050", },
@ -586,7 +586,7 @@ static struct i2c_driver qt1050_driver = {
.driver = { .driver = {
.name = "qt1050", .name = "qt1050",
.of_match_table = of_match_ptr(qt1050_of_match), .of_match_table = of_match_ptr(qt1050_of_match),
.pm = &qt1050_pm_ops, .pm = pm_sleep_ptr(&qt1050_pm_ops),
}, },
.probe_new = qt1050_probe, .probe_new = qt1050_probe,
}; };