Skip to contentSkip to conversation

Input: cyttsp5 - convert to DEFINE_SIMPLE_DEV_PM_OPS

PATCH Applied Diederik de Haas 2 participants 2 messages Oct 1 – Oct 2

Subsystems (3)
HID Input drivers Cyttsp touchscreen driver
lore
Share & tools
lore

Diederik de Haas

author
#0 lore raw

PATCH 1/1 Input: cyttsp5 - convert to DEFINE_SIMPLE_DEV_PM_OPS

The use of SIMPLE_DEV_PM_OPS got deprecated in commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones")

So convert the pm ops to use its replacement: DEFINE_SIMPLE_DEV_PM_OPS. This also allows us to drop the __maybe_unused attributes.

Signed-off-by Diederik de Haas <[email protected]>
---
 drivers/input/touchscreen/cyttsp5.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/input/touchscreen/cyttsp5.c +4 -4
index 9266c07314be..7b0613156fc1 100644
@@ -942,7 +942,7 @@ static const struct i2c_device_id cyttsp5_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, cyttsp5_i2c_id);
 
-static int __maybe_unused cyttsp5_suspend(struct device *dev)
+static int cyttsp5_suspend(struct device *dev)
 {
 	struct cyttsp5 *ts = dev_get_drvdata(dev);
 

@@ -952,7 +952,7 @@ static int __maybe_unused cyttsp5_suspend(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused cyttsp5_resume(struct device *dev)
+static int cyttsp5_resume(struct device *dev)
 {
 	struct cyttsp5 *ts = dev_get_drvdata(dev);
 

@@ -962,13 +962,13 @@ static int __maybe_unused cyttsp5_resume(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(cyttsp5_pm, cyttsp5_suspend, cyttsp5_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(cyttsp5_pm, cyttsp5_suspend, cyttsp5_resume);
 
 static struct i2c_driver cyttsp5_i2c_driver = {
 	.driver = {
 		.name = CYTTSP5_NAME,
 		.of_match_table = cyttsp5_of_match,
-		.pm = &cyttsp5_pm,
+		.pm = pm_sleep_ptr(&cyttsp5_pm),
 	},
 	.probe = cyttsp5_i2c_probe,
 	.id_table = cyttsp5_i2c_id,
Signature · 1 line
2.55.0
maintainer Applied
#1 lore raw
Quoted 7 lines · Diederik de Haas

The use of SIMPLE_DEV_PM_OPS got deprecated in commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones")

So convert the pm ops to use its replacement: DEFINE_SIMPLE_DEV_PM_OPS. This also allows us to drop the __maybe_unused attributes.

Signed-off-by Diederik de Haas <[email protected]>

Applied, thank you.

Signature · 1 line
Dmitry