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

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



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: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20230114171620.42891-15-jic23@kernel.org


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

drivers/input/input.c

+2 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/proc_fs.h>

#include <linux/sched.h>

#include <linux/seq_file.h>

#include <linux/pm.h>

#include <linux/poll.h>

#include <linux/device.h>

#include <linux/kstrtox.h>
@@ -1828,7 +1829,6 @@ static int input_uninhibit_device(struct input_dev *dev) 
	return ret;

}



#ifdef CONFIG_PM_SLEEP

static int input_dev_suspend(struct device *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,

	.restore	= input_dev_resume,

};

#endif /* CONFIG_PM */



static const struct device_type input_dev_type = {

	.groups		= input_dev_attr_groups,

	.release	= input_dev_release,

	.uevent		= input_dev_uevent,

#ifdef CONFIG_PM_SLEEP

	.pm		= &input_dev_pm_ops,

#endif

	.pm		= pm_sleep_ptr(&input_dev_pm_ops),

};



static char *input_devnode(const struct device *dev, umode_t *mode)