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

Input: wistron_btns - use pm_sleep_ptr() to allow removal of ifdef CONFIG_PM guards 



As the guards only apply to suspend and resume, #ifdef CONFIG_PM_SLEEP
would have been a tighter protection. As pm_sleep_ptr() lets the compiler
see the protected ops structure and callbacks but also lets the compiler
remove it as unused code if !CONFIG_PM_SLEEP this allows the #ifdef
guards to be removed, slightly simplifying the resulting code.

--
It seems likely that DEFINE_SIMPLE_DEV_PM_OPS() would work here but
I'd prefer not to make that change unless someone can confirm that the
extra callbacks registered will have no unwanted side effects in this
driver.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20230114171620.42891-17-jic23@kernel.org


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

drivers/input/misc/wistron_btns.c

+1 −5
Original line number Diff line number Diff line
@@ -1295,7 +1295,6 @@ static int wistron_remove(struct platform_device *dev) 
	return 0;

}



#ifdef CONFIG_PM

static int wistron_suspend(struct device *dev)

{

	if (have_wifi)
@@ -1330,14 +1329,11 @@ static const struct dev_pm_ops wistron_pm_ops = { 
	.poweroff	= wistron_suspend,

	.restore	= wistron_resume,

};

#endif



static struct platform_driver wistron_driver = {

	.driver		= {

		.name	= "wistron-bios",

#ifdef CONFIG_PM

		.pm	= &wistron_pm_ops,

#endif

		.pm	= pm_sleep_ptr(&wistron_pm_ops),

	},

	.probe		= wistron_probe,

	.remove		= wistron_remove,