kevin/linux
1
Fork 0
Code

Input: Use pm_sleep_ptr() to avoid need for ifdef CONFIG_PM_SLEEP

Browse Source 
As the new pm_sleep_ptr() macro lets the compiler see the code, but
then remove it if !CONFIG_PM_SLEEP it can be used to avoid the need
for #ifdef guards.  Use that in the input core to simplify the code
a little.  Note pm_sleep_ptr() has not been applied to each callback
in the ops structure because the pm_sleep_ptr() at the usage site
is sufficient.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20230114171620.42891-15-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2023-01-14 17:16:18 +00:00 committed by Dmitry Torokhov
parent f31e7388dd
commit 345c7b741c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/input.c
View File

@ -19,6 +19,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/pm.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kstrtox.h> #include <linux/kstrtox.h>
@ -1828,7 +1829,6 @@ out:
return ret; return ret;
} }
#ifdef CONFIG_PM_SLEEP
static int input_dev_suspend(struct device *dev) static int input_dev_suspend(struct device *dev)
{ {
struct input_dev *input_dev = to_input_dev(dev); struct input_dev *input_dev = to_input_dev(dev);
@ -1903,15 +1903,12 @@ static const struct dev_pm_ops input_dev_pm_ops = {
.poweroff = input_dev_poweroff, .poweroff = input_dev_poweroff,
.restore = input_dev_resume, .restore = input_dev_resume,
}; };
#endif /* CONFIG_PM */
static const struct device_type input_dev_type = { static const struct device_type input_dev_type = {
.groups = input_dev_attr_groups, .groups = input_dev_attr_groups,
.release = input_dev_release, .release = input_dev_release,
.uevent = input_dev_uevent, .uevent = input_dev_uevent,
#ifdef CONFIG_PM_SLEEP .pm = pm_sleep_ptr(&input_dev_pm_ops),
.pm = &input_dev_pm_ops,
#endif
}; };
static char *input_devnode(const struct device *dev, umode_t *mode) static char *input_devnode(const struct device *dev, umode_t *mode)