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

Input: zforce_ts - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()



SIMPLE_DEV_PM_OPS() is deprecated as it requires explicit protection
against unused function warnings.  The new combination of pm_sleep_ptr()
and DEFINE_SIMPLE_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 __maybe_unused markings.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-68-jic23@kernel.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent fea26099
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -608,7 +608,7 @@ static void zforce_input_close(struct input_dev *dev)
	return;
	return;
}
}


static int __maybe_unused zforce_suspend(struct device *dev)
static int zforce_suspend(struct device *dev)
{
{
	struct i2c_client *client = to_i2c_client(dev);
	struct i2c_client *client = to_i2c_client(dev);
	struct zforce_ts *ts = i2c_get_clientdata(client);
	struct zforce_ts *ts = i2c_get_clientdata(client);
@@ -653,7 +653,7 @@ static int __maybe_unused zforce_suspend(struct device *dev)
	return ret;
	return ret;
}
}


static int __maybe_unused zforce_resume(struct device *dev)
static int zforce_resume(struct device *dev)
{
{
	struct i2c_client *client = to_i2c_client(dev);
	struct i2c_client *client = to_i2c_client(dev);
	struct zforce_ts *ts = i2c_get_clientdata(client);
	struct zforce_ts *ts = i2c_get_clientdata(client);
@@ -691,7 +691,7 @@ static int __maybe_unused zforce_resume(struct device *dev)
	return ret;
	return ret;
}
}


static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume);
static DEFINE_SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume);


static void zforce_reset(void *data)
static void zforce_reset(void *data)
{
{
@@ -941,7 +941,7 @@ MODULE_DEVICE_TABLE(of, zforce_dt_idtable);
static struct i2c_driver zforce_driver = {
static struct i2c_driver zforce_driver = {
	.driver = {
	.driver = {
		.name	= "zforce-ts",
		.name	= "zforce-ts",
		.pm	= &zforce_pm_ops,
		.pm	= pm_sleep_ptr(&zforce_pm_ops),
		.of_match_table	= of_match_ptr(zforce_dt_idtable),
		.of_match_table	= of_match_ptr(zforce_dt_idtable),
	},
	},
	.probe_new	= zforce_probe,
	.probe_new	= zforce_probe,