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

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.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 6470215b

drivers/input/touchscreen/cyttsp4_core.c

+2 −7
Original line number Diff line number Diff line
@@ -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)

{

drivers/input/touchscreen/cyttsp4_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/input/touchscreen/cyttsp4_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -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,