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

Input: s6sy761 - 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>
Cc: Caleb Connolly <caleb@connolly.tech>
Cc: Andi Shyti <andi@etezian.org>
Tested-by: Caleb Connolly <caleb@connolly.tech> # oneplus-guacamole
Link: https://lore.kernel.org/r/20230114171620.42891-5-jic23@kernel.org


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

drivers/input/touchscreen/s6sy761.c

+7 −8
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static void s6sy761_remove(struct i2c_client *client) 
	pm_runtime_disable(&client->dev);

}



static int __maybe_unused s6sy761_runtime_suspend(struct device *dev)

static int s6sy761_runtime_suspend(struct device *dev)

{

	struct s6sy761_data *sdata = dev_get_drvdata(dev);
@@ -487,7 +487,7 @@ static int __maybe_unused s6sy761_runtime_suspend(struct device *dev) 
				S6SY761_APPLICATION_MODE, S6SY761_APP_SLEEP);

}



static int __maybe_unused s6sy761_runtime_resume(struct device *dev)

static int s6sy761_runtime_resume(struct device *dev)

{

	struct s6sy761_data *sdata = dev_get_drvdata(dev);
@@ -495,7 +495,7 @@ static int __maybe_unused s6sy761_runtime_resume(struct device *dev) 
				S6SY761_APPLICATION_MODE, S6SY761_APP_NORMAL);

}



static int __maybe_unused s6sy761_suspend(struct device *dev)

static int s6sy761_suspend(struct device *dev)

{

	struct s6sy761_data *sdata = dev_get_drvdata(dev);
@@ -504,7 +504,7 @@ static int __maybe_unused s6sy761_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused s6sy761_resume(struct device *dev)

static int s6sy761_resume(struct device *dev)

{

	struct s6sy761_data *sdata = dev_get_drvdata(dev);
@@ -514,9 +514,8 @@ static int __maybe_unused s6sy761_resume(struct device *dev) 
}



static const struct dev_pm_ops s6sy761_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(s6sy761_suspend, s6sy761_resume)

	SET_RUNTIME_PM_OPS(s6sy761_runtime_suspend,

				s6sy761_runtime_resume, NULL)

	SYSTEM_SLEEP_PM_OPS(s6sy761_suspend, s6sy761_resume)

	RUNTIME_PM_OPS(s6sy761_runtime_suspend, s6sy761_runtime_resume, NULL)

};



#ifdef CONFIG_OF
@@ -537,7 +536,7 @@ static struct i2c_driver s6sy761_driver = { 
	.driver = {

		.name = S6SY761_DEV_NAME,

		.of_match_table = of_match_ptr(s6sy761_of_match),

		.pm = &s6sy761_pm_ops,

		.pm = pm_ptr(&s6sy761_pm_ops),

	},

	.probe_new = s6sy761_probe,

	.remove = s6sy761_remove,