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

Input: cypress-sf - 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-5-jic23@kernel.org


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

drivers/input/keyboard/cypress-sf.c

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

};



static int __maybe_unused cypress_sf_suspend(struct device *dev)

static int cypress_sf_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct cypress_sf_data *touchkey = i2c_get_clientdata(client);
@@ -187,7 +187,7 @@ static int __maybe_unused cypress_sf_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused cypress_sf_resume(struct device *dev)

static int cypress_sf_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct cypress_sf_data *touchkey = i2c_get_clientdata(client);
@@ -205,7 +205,7 @@ static int __maybe_unused cypress_sf_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(cypress_sf_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(cypress_sf_pm_ops,

				cypress_sf_suspend, cypress_sf_resume);



static struct i2c_device_id cypress_sf_id_table[] = {
@@ -225,7 +225,7 @@ MODULE_DEVICE_TABLE(of, cypress_sf_of_match); 
static struct i2c_driver cypress_sf_driver = {

	.driver = {

		.name = CYPRESS_SF_DEV_NAME,

		.pm = &cypress_sf_pm_ops,

		.pm = pm_sleep_ptr(&cypress_sf_pm_ops),

		.of_match_table = of_match_ptr(cypress_sf_of_match),

	},

	.id_table = cypress_sf_id_table,