Commit 2cb21a62 authored by Thomas Richard's avatar Thomas Richard Committed by Andi Shyti
Browse files

i2c: omap: switch to NOIRQ_SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS() 



Replace SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() by
NOIRQ_SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS().
The usage of pm_ptr() and these more recent macros allows the compiler to
see and drop the dead code.
The unnecessary '__maybe_unused' annotations on PM functions can be
removed.

Signed-off-by: default avatarThomas Richard <thomas.richard@bootlin.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 69ab71bd

drivers/i2c/busses/i2c-omap.c

+7 −7
Original line number Diff line number Diff line
@@ -1534,7 +1534,7 @@ static void omap_i2c_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev)

static int omap_i2c_runtime_suspend(struct device *dev)

{

	struct omap_i2c_dev *omap = dev_get_drvdata(dev);
@@ -1560,7 +1560,7 @@ static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused omap_i2c_runtime_resume(struct device *dev)

static int omap_i2c_runtime_resume(struct device *dev)

{

	struct omap_i2c_dev *omap = dev_get_drvdata(dev);
@@ -1575,9 +1575,9 @@ static int __maybe_unused omap_i2c_runtime_resume(struct device *dev) 
}



static const struct dev_pm_ops omap_i2c_pm_ops = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

	NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				  pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,

	RUNTIME_PM_OPS(omap_i2c_runtime_suspend,

		       omap_i2c_runtime_resume, NULL)

};
@@ -1586,7 +1586,7 @@ static struct platform_driver omap_i2c_driver = { 
	.remove_new	= omap_i2c_remove,

	.driver		= {

		.name	= "omap_i2c",

		.pm	= &omap_i2c_pm_ops,

		.pm	= pm_ptr(&omap_i2c_pm_ops),

		.of_match_table = of_match_ptr(omap_i2c_of_match),

	},

};