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

Input: omap4-keyad - use pm_ptr() and RUNTIME_DEV_PM_OPS() 



SET_RUNTIME_DEV_PM_OPS() is deprecated as it requires explicit protection
against unused function warnings.  The new combination of pm_ptr()
and RUNTIME_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 __maybe_unused markings.

Note that DEFINE_RUNTIME_DEV_PM_OPS() is not used because that adds
additional callbacks for suspend and resume and would need
testing.

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


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

drivers/input/keyboard/omap4-keypad.c

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int omap4_keypad_check_revision(struct device *dev, 
 * Interrupt may not happen for key-up events. We must clear stuck

 * key-up events after the keyboard hardware has auto-idled.

 */

static int __maybe_unused omap4_keypad_runtime_suspend(struct device *dev)

static int omap4_keypad_runtime_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct omap4_keypad *keypad_data = platform_get_drvdata(pdev);
@@ -328,7 +328,7 @@ static int __maybe_unused omap4_keypad_runtime_suspend(struct device *dev) 
}



static const struct dev_pm_ops omap4_keypad_pm_ops = {

	SET_RUNTIME_PM_OPS(omap4_keypad_runtime_suspend, NULL, NULL)

	RUNTIME_PM_OPS(omap4_keypad_runtime_suspend, NULL, NULL)

};



static void omap4_disable_pm(void *d)
@@ -488,7 +488,7 @@ static struct platform_driver omap4_keypad_driver = { 
	.driver		= {

		.name	= "omap4-keypad",

		.of_match_table = omap_keypad_dt_match,

		.pm = &omap4_keypad_pm_ops,

		.pm = pm_ptr(&omap4_keypad_pm_ops),

	},

};

module_platform_driver(omap4_keypad_driver);