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

Input: pmic8xxx-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-20-jic23@kernel.org


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

drivers/input/keyboard/pmic8xxx-keypad.c

+3 −5
Original line number Diff line number Diff line
@@ -621,7 +621,6 @@ static int pmic8xxx_kp_probe(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int pmic8xxx_kp_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);
@@ -661,9 +660,8 @@ static int pmic8xxx_kp_resume(struct device *dev) 


	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(pm8xxx_kp_pm_ops,

static DEFINE_SIMPLE_DEV_PM_OPS(pm8xxx_kp_pm_ops,

				pmic8xxx_kp_suspend, pmic8xxx_kp_resume);



static const struct of_device_id pm8xxx_match_table[] = {
@@ -677,7 +675,7 @@ static struct platform_driver pmic8xxx_kp_driver = { 
	.probe		= pmic8xxx_kp_probe,

	.driver		= {

		.name = "pm8xxx-keypad",

		.pm = &pm8xxx_kp_pm_ops,

		.pm = pm_sleep_ptr(&pm8xxx_kp_pm_ops),

		.of_match_table = pm8xxx_match_table,

	},

};