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

Input: matrix-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-16-jic23@kernel.org


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

drivers/input/keyboard/matrix_keypad.c

+3 −5
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ static void matrix_keypad_stop(struct input_dev *dev) 
	disable_row_irqs(keypad);

}



#ifdef CONFIG_PM_SLEEP

static void matrix_keypad_enable_wakeup(struct matrix_keypad *keypad)

{

	const struct matrix_keypad_platform_data *pdata = keypad->pdata;
@@ -299,9 +298,8 @@ static int matrix_keypad_resume(struct device *dev) 


	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops,

				matrix_keypad_suspend, matrix_keypad_resume);



static int matrix_keypad_init_gpio(struct platform_device *pdev,
@@ -577,7 +575,7 @@ static struct platform_driver matrix_keypad_driver = { 
	.remove		= matrix_keypad_remove,

	.driver		= {

		.name	= "matrix-keypad",

		.pm	= &matrix_keypad_pm_ops,

		.pm	= pm_sleep_ptr(&matrix_keypad_pm_ops),

		.of_match_table = of_match_ptr(matrix_keypad_dt_match),

	},

};