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

Input: pxa27x_keypad - 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 ifdef guards.

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


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

drivers/input/keyboard/pxa27x_keypad.c

+3 −5
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static void pxa27x_keypad_close(struct input_dev *dev) 
	clk_disable_unprepare(keypad->clk);

}



#ifdef CONFIG_PM_SLEEP

static int pxa27x_keypad_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);
@@ -706,9 +705,8 @@ static int pxa27x_keypad_resume(struct device *dev) 


	return ret;

}

#endif



static SIMPLE_DEV_PM_OPS(pxa27x_keypad_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(pxa27x_keypad_pm_ops,

				pxa27x_keypad_suspend, pxa27x_keypad_resume);
@@ -830,7 +828,7 @@ static struct platform_driver pxa27x_keypad_driver = { 
	.driver		= {

		.name	= "pxa27x-keypad",

		.of_match_table = of_match_ptr(pxa27x_keypad_dt_match),

		.pm	= &pxa27x_keypad_pm_ops,

		.pm	= pm_sleep_ptr(&pxa27x_keypad_pm_ops),

	},

};

module_platform_driver(pxa27x_keypad_driver);