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

Input: mpr121-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-9-jic23@kernel.org


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

drivers/input/keyboard/mpr121_touchkey.c

+4 −4
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int mpr_touchkey_probe(struct i2c_client *client) 
	return 0;

}



static int __maybe_unused mpr_suspend(struct device *dev)

static int mpr_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);
@@ -352,7 +352,7 @@ static int __maybe_unused mpr_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused mpr_resume(struct device *dev)

static int mpr_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct mpr121_touchkey *mpr121 = i2c_get_clientdata(client);
@@ -366,7 +366,7 @@ static int __maybe_unused mpr_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(mpr121_touchkey_pm_ops, mpr_suspend, mpr_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(mpr121_touchkey_pm_ops, mpr_suspend, mpr_resume);



static const struct i2c_device_id mpr121_id[] = {

	{ "mpr121_touchkey", 0 },
@@ -385,7 +385,7 @@ MODULE_DEVICE_TABLE(of, mpr121_touchkey_dt_match_table); 
static struct i2c_driver mpr_touchkey_driver = {

	.driver = {

		.name	= "mpr121",

		.pm	= &mpr121_touchkey_pm_ops,

		.pm	= pm_sleep_ptr(&mpr121_touchkey_pm_ops),

		.of_match_table = of_match_ptr(mpr121_touchkey_dt_match_table),

	},

	.id_table	= mpr121_id,