mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
Input: rotary-encoder - 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: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230102181842.718010-23-jic23@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
1a3e6c1ee4
commit
4268a06bf4
1 changed files with 5 additions and 5 deletions
|
@ -317,7 +317,7 @@ static int rotary_encoder_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __maybe_unused rotary_encoder_suspend(struct device *dev)
|
static int rotary_encoder_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct rotary_encoder *encoder = dev_get_drvdata(dev);
|
struct rotary_encoder *encoder = dev_get_drvdata(dev);
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -330,7 +330,7 @@ static int __maybe_unused rotary_encoder_suspend(struct device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __maybe_unused rotary_encoder_resume(struct device *dev)
|
static int rotary_encoder_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
struct rotary_encoder *encoder = dev_get_drvdata(dev);
|
struct rotary_encoder *encoder = dev_get_drvdata(dev);
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -343,8 +343,8 @@ static int __maybe_unused rotary_encoder_resume(struct device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SIMPLE_DEV_PM_OPS(rotary_encoder_pm_ops,
|
static DEFINE_SIMPLE_DEV_PM_OPS(rotary_encoder_pm_ops,
|
||||||
rotary_encoder_suspend, rotary_encoder_resume);
|
rotary_encoder_suspend, rotary_encoder_resume);
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
#ifdef CONFIG_OF
|
||||||
static const struct of_device_id rotary_encoder_of_match[] = {
|
static const struct of_device_id rotary_encoder_of_match[] = {
|
||||||
|
@ -358,7 +358,7 @@ static struct platform_driver rotary_encoder_driver = {
|
||||||
.probe = rotary_encoder_probe,
|
.probe = rotary_encoder_probe,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
.pm = &rotary_encoder_pm_ops,
|
.pm = pm_sleep_ptr(&rotary_encoder_pm_ops),
|
||||||
.of_match_table = of_match_ptr(rotary_encoder_of_match),
|
.of_match_table = of_match_ptr(rotary_encoder_of_match),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue