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

Input: mcs-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 ifdef guards.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20221204180841.2211588-18-jic23@kernel.org


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

drivers/input/keyboard/mcs_touchkey.c

+3 −5
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ static void mcs_touchkey_shutdown(struct i2c_client *client) 
		data->poweron(false);

}



#ifdef CONFIG_PM_SLEEP

static int mcs_touchkey_suspend(struct device *dev)

{

	struct mcs_touchkey_data *data = dev_get_drvdata(dev);
@@ -243,9 +242,8 @@ static int mcs_touchkey_resume(struct device *dev) 


	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(mcs_touchkey_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(mcs_touchkey_pm_ops,

				mcs_touchkey_suspend, mcs_touchkey_resume);



static const struct i2c_device_id mcs_touchkey_id[] = {
@@ -258,7 +256,7 @@ MODULE_DEVICE_TABLE(i2c, mcs_touchkey_id); 
static struct i2c_driver mcs_touchkey_driver = {

	.driver = {

		.name	= "mcs_touchkey",

		.pm	= &mcs_touchkey_pm_ops,

		.pm	= pm_sleep_ptr(&mcs_touchkey_pm_ops),

	},

	.probe_new	= mcs_touchkey_probe,

	.remove		= mcs_touchkey_remove,