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

Input: samsung-keypad - switch to pm_ptr() and SYSTEM_SLEEP/RUNTIME_PM_OPS() 



The SET_ variants are deprecated as they require explicit protection
against unused function warnings.  The new combination of pm_ptr()
and SYSTEM_SLEEP/RUNTIME_DEV_PM_OPS() allow 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/20230114171620.42891-4-jic23@kernel.org


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

drivers/input/keyboard/samsung-keypad.c

+4 −8
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ static int samsung_keypad_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int samsung_keypad_runtime_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);
@@ -503,9 +502,7 @@ static int samsung_keypad_runtime_resume(struct device *dev) 


	return 0;

}

#endif



#ifdef CONFIG_PM_SLEEP

static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,

					 bool enable)

{
@@ -563,11 +560,10 @@ static int samsung_keypad_resume(struct device *dev) 


	return 0;

}

#endif



static const struct dev_pm_ops samsung_keypad_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(samsung_keypad_suspend, samsung_keypad_resume)

	SET_RUNTIME_PM_OPS(samsung_keypad_runtime_suspend,

	SYSTEM_SLEEP_PM_OPS(samsung_keypad_suspend, samsung_keypad_resume)

	RUNTIME_PM_OPS(samsung_keypad_runtime_suspend,

		       samsung_keypad_runtime_resume, NULL)

};
@@ -598,7 +594,7 @@ static struct platform_driver samsung_keypad_driver = { 
	.driver		= {

		.name	= "samsung-keypad",

		.of_match_table = of_match_ptr(samsung_keypad_dt_match),

		.pm	= &samsung_keypad_pm_ops,

		.pm	= pm_ptr(&samsung_keypad_pm_ops),

	},

	.id_table	= samsung_keypad_driver_ids,

};