Commit ebbdbef2 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dmitry Torokhov

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 use cases with one via
pm_runtime_force_suspend() / pm_runtime_force_resume() that only
do anything to the device if we are not already in the appropriate
runtime suspended state.
Signed-off-by: default avatarJonathan 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.

Link: https://lore.kernel.org/r/20230114171620.42891-11-jic23@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 6470215b
...@@ -1744,7 +1744,6 @@ static void cyttsp4_free_si_ptrs(struct cyttsp4 *cd) ...@@ -1744,7 +1744,6 @@ static void cyttsp4_free_si_ptrs(struct cyttsp4 *cd)
kfree(si->btn_rec_data); kfree(si->btn_rec_data);
} }
#ifdef CONFIG_PM
static int cyttsp4_core_sleep(struct cyttsp4 *cd) static int cyttsp4_core_sleep(struct cyttsp4 *cd)
{ {
int rc; int rc;
...@@ -1877,13 +1876,9 @@ static int cyttsp4_core_resume(struct device *dev) ...@@ -1877,13 +1876,9 @@ static int cyttsp4_core_resume(struct device *dev)
return 0; return 0;
} }
#endif
const struct dev_pm_ops cyttsp4_pm_ops = { EXPORT_GPL_RUNTIME_DEV_PM_OPS(cyttsp4_pm_ops,
SET_SYSTEM_SLEEP_PM_OPS(cyttsp4_core_suspend, cyttsp4_core_resume) cyttsp4_core_suspend, cyttsp4_core_resume, NULL);
SET_RUNTIME_PM_OPS(cyttsp4_core_suspend, cyttsp4_core_resume, NULL)
};
EXPORT_SYMBOL_GPL(cyttsp4_pm_ops);
static int cyttsp4_mt_open(struct input_dev *input) static int cyttsp4_mt_open(struct input_dev *input)
{ {
......
...@@ -58,7 +58,7 @@ MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id); ...@@ -58,7 +58,7 @@ MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id);
static struct i2c_driver cyttsp4_i2c_driver = { static struct i2c_driver cyttsp4_i2c_driver = {
.driver = { .driver = {
.name = CYTTSP4_I2C_NAME, .name = CYTTSP4_I2C_NAME,
.pm = &cyttsp4_pm_ops, .pm = pm_ptr(&cyttsp4_pm_ops),
}, },
.probe_new = cyttsp4_i2c_probe, .probe_new = cyttsp4_i2c_probe,
.remove = cyttsp4_i2c_remove, .remove = cyttsp4_i2c_remove,
......
...@@ -173,7 +173,7 @@ static void cyttsp4_spi_remove(struct spi_device *spi) ...@@ -173,7 +173,7 @@ static void cyttsp4_spi_remove(struct spi_device *spi)
static struct spi_driver cyttsp4_spi_driver = { static struct spi_driver cyttsp4_spi_driver = {
.driver = { .driver = {
.name = CYTTSP4_SPI_NAME, .name = CYTTSP4_SPI_NAME,
.pm = &cyttsp4_pm_ops, .pm = pm_ptr(&cyttsp4_pm_ops),
}, },
.probe = cyttsp4_spi_probe, .probe = cyttsp4_spi_probe,
.remove = cyttsp4_spi_remove, .remove = cyttsp4_spi_remove,
......
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