From 304c92e8fcf5863a40de60baf0576cab6b046bcf Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 1 Feb 2017 17:16:24 +0100 Subject: [PATCH] pinctrl: samsung: mark PM functions as __maybe_unused The rework of the suspend/resume handling uses the wrong #ifdef check, leading to a build warning without CONFIG_PM_SLEEP: drivers/pinctrl/samsung/pinctrl-samsung.c:1142:12: error: 'samsung_pinctrl_resume' defined but not used [-Werror=unused-function] drivers/pinctrl/samsung/pinctrl-samsung.c:1092:12: error: 'samsung_pinctrl_suspend' defined but not used [-Werror=unused-function] Using a __maybe_unused annotation instead of the #ifdef is a simple way to avoid this problem class. Fixes: 2b24efa8e5c5 ("pinctrl: samsung: Replace syscore ops with standard platform device pm_ops") Signed-off-by: Arnd Bergmann Acked-by: Marek Szyprowski Signed-off-by: Linus Walleij --- drivers/pinctrl/samsung/pinctrl-samsung.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index d79eadad6c5f..d601b5303e73 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1083,13 +1083,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM /** * samsung_pinctrl_suspend - save pinctrl state for suspend * * Save data for all banks handled by this device. */ -static int samsung_pinctrl_suspend(struct device *dev) +static int __maybe_unused samsung_pinctrl_suspend(struct device *dev) { struct samsung_pinctrl_drv_data *drvdata = dev_get_drvdata(dev); int i; @@ -1139,7 +1138,7 @@ static int samsung_pinctrl_suspend(struct device *dev) * We don't bother doing anything complicated to avoid glitching lines since * we're called before pad retention is turned off. */ -static int samsung_pinctrl_resume(struct device *dev) +static int __maybe_unused samsung_pinctrl_resume(struct device *dev) { struct samsung_pinctrl_drv_data *drvdata = dev_get_drvdata(dev); int i; @@ -1183,7 +1182,6 @@ static int samsung_pinctrl_resume(struct device *dev) return 0; } -#endif static const struct of_device_id samsung_pinctrl_dt_match[] = { #ifdef CONFIG_PINCTRL_EXYNOS -- 2.20.1