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

Input: tm2-touchkey - 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>
Link: https://lore.kernel.org/r/20221204180841.2211588-13-jic23@kernel.org


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

drivers/input/keyboard/tm2-touchkey.c

+5 −5
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int tm2_touchkey_probe(struct i2c_client *client) 
	return 0;

}



static int __maybe_unused tm2_touchkey_suspend(struct device *dev)

static int tm2_touchkey_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct tm2_touchkey_data *touchkey = i2c_get_clientdata(client);
@@ -308,7 +308,7 @@ static int __maybe_unused tm2_touchkey_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused tm2_touchkey_resume(struct device *dev)

static int tm2_touchkey_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct tm2_touchkey_data *touchkey = i2c_get_clientdata(client);
@@ -323,7 +323,7 @@ static int __maybe_unused tm2_touchkey_resume(struct device *dev) 
	return ret;

}



static SIMPLE_DEV_PM_OPS(tm2_touchkey_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(tm2_touchkey_pm_ops,

				tm2_touchkey_suspend, tm2_touchkey_resume);



static const struct i2c_device_id tm2_touchkey_id_table[] = {
@@ -353,7 +353,7 @@ MODULE_DEVICE_TABLE(of, tm2_touchkey_of_match); 
static struct i2c_driver tm2_touchkey_driver = {

	.driver = {

		.name = TM2_TOUCHKEY_DEV_NAME,

		.pm = &tm2_touchkey_pm_ops,

		.pm = pm_sleep_ptr(&tm2_touchkey_pm_ops),

		.of_match_table = of_match_ptr(tm2_touchkey_of_match),

	},

	.probe_new = tm2_touchkey_probe,