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

Input: cyapa - switch to SYSTEM_SLEEP/RUNTIME_PM_OPS() and pm_ptr() 



SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated as
they require explicit protection against unused function warnings.
The new combination of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/
RUNTIME_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/20230114171620.42891-2-jic23@kernel.org


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

drivers/input/mouse/cyapa.c

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

}



static int __maybe_unused cyapa_suspend(struct device *dev)

static int cyapa_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct cyapa *cyapa = i2c_get_clientdata(client);
@@ -1397,7 +1397,7 @@ static int __maybe_unused cyapa_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused cyapa_resume(struct device *dev)

static int cyapa_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct cyapa *cyapa = i2c_get_clientdata(client);
@@ -1424,7 +1424,7 @@ static int __maybe_unused cyapa_resume(struct device *dev) 
	return 0;

}



static int __maybe_unused cyapa_runtime_suspend(struct device *dev)

static int cyapa_runtime_suspend(struct device *dev)

{

	struct cyapa *cyapa = dev_get_drvdata(dev);

	int error;
@@ -1439,7 +1439,7 @@ static int __maybe_unused cyapa_runtime_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused cyapa_runtime_resume(struct device *dev)

static int cyapa_runtime_resume(struct device *dev)

{

	struct cyapa *cyapa = dev_get_drvdata(dev);

	int error;
@@ -1453,8 +1453,8 @@ static int __maybe_unused cyapa_runtime_resume(struct device *dev) 
}



static const struct dev_pm_ops cyapa_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(cyapa_suspend, cyapa_resume)

	SET_RUNTIME_PM_OPS(cyapa_runtime_suspend, cyapa_runtime_resume, NULL)

	SYSTEM_SLEEP_PM_OPS(cyapa_suspend, cyapa_resume)

	RUNTIME_PM_OPS(cyapa_runtime_suspend, cyapa_runtime_resume, NULL)

};



static const struct i2c_device_id cyapa_id_table[] = {
@@ -1484,7 +1484,7 @@ MODULE_DEVICE_TABLE(of, cyapa_of_match); 
static struct i2c_driver cyapa_driver = {

	.driver = {

		.name = "cyapa",

		.pm = &cyapa_pm_ops,

		.pm = pm_ptr(&cyapa_pm_ops),

		.acpi_match_table = ACPI_PTR(cyapa_acpi_id),

		.of_match_table = of_match_ptr(cyapa_of_match),

	},