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

Input: cyttsp - use EXPORT_GPL_SIMPLE_DEV_PM_OPS() 



SIMPLE_DEV_PM_OPS() is deprecated as it requires explicit protection
against unused function warnings.  The new combination of pm_sleep_ptr()
and EXPORT_GPL_SIMPLE_DEV_PMU_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.
It also rolls in the EXPORT_SYMBOL() so that we only export it
if CONFIG_PM_SLEEP.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Javier Martinez Canillas <javier@dowhile0.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230114171620.42891-12-jic23@kernel.org


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

drivers/input/touchscreen/cyttsp_core.c

+3 −4
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int cyttsp_disable(struct cyttsp *ts) 
	return 0;

}



static int __maybe_unused cyttsp_suspend(struct device *dev)

static int cyttsp_suspend(struct device *dev)

{

	struct cyttsp *ts = dev_get_drvdata(dev);

	int retval = 0;
@@ -509,7 +509,7 @@ static int __maybe_unused cyttsp_suspend(struct device *dev) 
	return retval;

}



static int __maybe_unused cyttsp_resume(struct device *dev)

static int cyttsp_resume(struct device *dev)

{

	struct cyttsp *ts = dev_get_drvdata(dev);
@@ -525,8 +525,7 @@ static int __maybe_unused cyttsp_resume(struct device *dev) 
	return 0;

}



SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume);

EXPORT_SYMBOL_GPL(cyttsp_pm_ops);

EXPORT_GPL_SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume);



static int cyttsp_open(struct input_dev *dev)

{

drivers/input/touchscreen/cyttsp_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ MODULE_DEVICE_TABLE(of, cyttsp_of_i2c_match); 
static struct i2c_driver cyttsp_i2c_driver = {

	.driver = {

		.name	= CY_I2C_NAME,

		.pm	= &cyttsp_pm_ops,

		.pm	= pm_sleep_ptr(&cyttsp_pm_ops),

		.of_match_table = cyttsp_of_i2c_match,

	},

	.probe_new	= cyttsp_i2c_probe,

drivers/input/touchscreen/cyttsp_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ MODULE_DEVICE_TABLE(of, cyttsp_of_spi_match); 
static struct spi_driver cyttsp_spi_driver = {

	.driver = {

		.name	= CY_SPI_NAME,

		.pm	= &cyttsp_pm_ops,

		.pm	= pm_sleep_ptr(&cyttsp_pm_ops),

		.of_match_table = cyttsp_of_spi_match,

	},

	.probe  = cyttsp_spi_probe,