From: Laxman Dewangan Date: Sat, 18 Aug 2012 12:19:58 +0000 (+0530) Subject: i2c: tegra: protect suspend/resume callbacks with CONFIG_PM_SLEEP X-Git-Tag: firefly_0821_release~3680^2~2169^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=371e67c9e1a82b5fd8110b9a25e36bbc3a99e8c7;p=firefly-linux-kernel-4.4.55.git i2c: tegra: protect suspend/resume callbacks with CONFIG_PM_SLEEP The CONFIG_PM doesn't actually enable any of the PM callbacks, it only allows to enable CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME. This means if CONFIG_PM is used to protect system sleep callbacks then it may end up unreferenced if only runtime PM is enabled. Hence protecting sleep callbacks with CONFIG_PM_SLEEP. Signed-off-by: Laxman Dewangan Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 66eb53fac202..9a08c57bc936 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -712,7 +712,7 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int tegra_i2c_suspend(struct device *dev) { struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);