diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-12-22 19:55:11 +0000 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-12-28 17:29:24 +0000 |
| commit | 04b026de3e08516a0e1a2d4b0e690a5d82cb05a5 (patch) | |
| tree | 3339d9bebedc8a0cddf8bbe4ac0370807d2e3848 | |
| parent | f32bcb144a006f5a7b05be9b65ab87097490b9bf (diff) | |
| download | iio-04b026de3e08516a0e1a2d4b0e690a5d82cb05a5.tar.gz | |
Input: cyttsp4 - Use EXPORT_GPL_RUNTIME_DEV_PM_OPS
SET_SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS() are deprecated as
they requires explicit protection against unused function warnings.
The new combination of pm_ptr() EXPORT_GPL_RUNTIME_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 #ifdef guards.
Note that we are replacing an unconditional call to the suspend
and resume functions for sleep usecases with one via
pm_runtime_force_suspend() / pm_runtime_force_resume() that only
do anything to the device if we are not alread in the appropriate
runtime suspended state.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
--
I 'think' this should be fine in that it can only reduce the number
of unnecessary suspends. If anyone can test that would be great.
| -rw-r--r-- | drivers/input/touchscreen/cyttsp4_core.c | 9 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cyttsp4_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cyttsp4_spi.c | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c index dccbcb942fe59a..0cd6f626adec5d 100644 --- a/drivers/input/touchscreen/cyttsp4_core.c +++ b/drivers/input/touchscreen/cyttsp4_core.c @@ -1744,7 +1744,6 @@ static void cyttsp4_free_si_ptrs(struct cyttsp4 *cd) kfree(si->btn_rec_data); } -#ifdef CONFIG_PM static int cyttsp4_core_sleep(struct cyttsp4 *cd) { int rc; @@ -1877,13 +1876,9 @@ static int cyttsp4_core_resume(struct device *dev) return 0; } -#endif -const struct dev_pm_ops cyttsp4_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(cyttsp4_core_suspend, cyttsp4_core_resume) - SET_RUNTIME_PM_OPS(cyttsp4_core_suspend, cyttsp4_core_resume, NULL) -}; -EXPORT_SYMBOL_GPL(cyttsp4_pm_ops); +EXPORT_GPL_RUNTIME_DEV_PM_OPS(cyttsp4_pm_ops, + cyttsp4_core_suspend, cyttsp4_core_resume, NULL); static int cyttsp4_mt_open(struct input_dev *input) { diff --git a/drivers/input/touchscreen/cyttsp4_i2c.c b/drivers/input/touchscreen/cyttsp4_i2c.c index c260bab0c62c77..ec7a4779f3fbf8 100644 --- a/drivers/input/touchscreen/cyttsp4_i2c.c +++ b/drivers/input/touchscreen/cyttsp4_i2c.c @@ -58,7 +58,7 @@ MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id); static struct i2c_driver cyttsp4_i2c_driver = { .driver = { .name = CYTTSP4_I2C_NAME, - .pm = &cyttsp4_pm_ops, + .pm = pm_ptr(&cyttsp4_pm_ops), }, .probe_new = cyttsp4_i2c_probe, .remove = cyttsp4_i2c_remove, diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c index 5d7db84f2749c0..944fbbe9113e13 100644 --- a/drivers/input/touchscreen/cyttsp4_spi.c +++ b/drivers/input/touchscreen/cyttsp4_spi.c @@ -173,7 +173,7 @@ static void cyttsp4_spi_remove(struct spi_device *spi) static struct spi_driver cyttsp4_spi_driver = { .driver = { .name = CYTTSP4_SPI_NAME, - .pm = &cyttsp4_pm_ops, + .pm = pm_ptr(&cyttsp4_pm_ops), }, .probe = cyttsp4_spi_probe, .remove = cyttsp4_spi_remove, |