Message ID | 1415280455-14056-1-git-send-email-ulf.hansson@linaro.org |
---|---|
State | Accepted |
Commit | dbd8fbefd833da9f212d19e0034b62c02c644b70 |
Headers | show |
On Thu, Nov 06, 2014 at 02:27:35PM +0100, Ulf Hansson wrote: > The system PM functions were unused when CONFIG_PM is unset. Let's move > them inside CONFIG_PM_SLEEP to silence the compiler warning. > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Both patches applied.
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 92105f3..83811aa 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -1688,6 +1688,7 @@ static void ux500_cryp_shutdown(struct platform_device *pdev) } +#ifdef CONFIG_PM_SLEEP static int ux500_cryp_suspend(struct device *dev) { int ret; @@ -1768,6 +1769,7 @@ static int ux500_cryp_resume(struct device *dev) return ret; } +#endif static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume);
The system PM functions were unused when CONFIG_PM is unset. Let's move them inside CONFIG_PM_SLEEP to silence the compiler warning. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/crypto/ux500/cryp/cryp_core.c | 2 ++ 1 file changed, 2 insertions(+)