Skip to contentSkip to conversation

mfd: ab8500-gpadc: add CONFIG_PM_SLEEP to suspend/resume

PATCH In review Jingoo Han 3 participants 4 messages Aug 2, 2013 – Aug 14, 2013

Subsystems (2)
Multifunction devices (MFD) Arm/nomadik/Ux500 architectures
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 2/2 mfd: ab8500-gpadc: add CONFIG_PM_SLEEP to suspend/resume

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled.

drivers/mfd/ab8500-gpadc.c:891:12: warning: 'ab8500_gpadc_suspend' defined but not used [-Wunused-function] drivers/mfd/ab8500-gpadc.c:903:12: warning: 'ab8500_gpadc_resume' defined but not used [-Wunused-function]

Signed-off-by Jingoo Han <[email protected]>
---
 drivers/mfd/ab8500-gpadc.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/mfd/ab8500-gpadc.c +2 -0
index 77c616f..36000f9 100644
@@ -888,6 +888,7 @@ static int ab8500_gpadc_runtime_resume(struct device *dev)
 }
 #endif
 
+#ifdef CONFIG_PM_SLEEP
 static int ab8500_gpadc_suspend(struct device *dev)
 {
 	struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);

@@ -915,6 +916,7 @@ static int ab8500_gpadc_resume(struct device *dev)
 	mutex_unlock(&gpadc->ab8500_gpadc_lock);
 	return ret;
 }
+#endif
 
 static int ab8500_gpadc_probe(struct platform_device *pdev)
 {
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 26 lines · Jingoo Han

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled.

drivers/mfd/ab8500-gpadc.c:891:12: warning: 'ab8500_gpadc_suspend' defined but not used [-Wunused-function] drivers/mfd/ab8500-gpadc.c:903:12: warning: 'ab8500_gpadc_resume' defined but not used [-Wunused-function]

Signed-off-by Jingoo Han <[email protected]>
---
 drivers/mfd/ab8500-gpadc.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/mfd/ab8500-gpadc.c +1 -0
index 77c616f..36000f9 100644
@@ -888,6 +888,7 @@ static int ab8500_gpadc_runtime_resume(struct device *dev)
 }
 #endif
 
+#ifdef CONFIG_PM_SLEEP
 static int ab8500_gpadc_suspend(struct device *dev)
 {
 	struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);

drivers/mfd/ab8500-gpadc.c static int ab8500_gpadc_resume(struct device *dev) · line 922

Quoted 7 lines
drivers/mfd/ab8500-gpadc.c +1 -0
@@ -915,6 +916,7 @@ static int ab8500_gpadc_resume(struct device *dev)
 	mutex_unlock(&gpadc->ab8500_gpadc_lock);
 	return ret;
 }
+#endif
 
 static int ab8500_gpadc_probe(struct platform_device *pdev)
 {

Looks sensible. I wonder why we haven't caught these before.

I guess we always enable PM_SLEEP.

Applied until Linus tells me otherwise.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Acked-by on v1 2/2
#2 lore raw
In reply to Jingoo Han
Quoted 9 lines · Jingoo Han

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled.

drivers/mfd/ab8500-gpadc.c:891:12: warning: 'ab8500_gpadc_suspend' defined but not used [-Wunused-function] drivers/mfd/ab8500-gpadc.c:903:12: warning: 'ab8500_gpadc_resume' defined but not used [-Wunused-function]

Signed-off-by Jingoo Han <[email protected]>
Acked-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

#3 lore raw
Quoted 7 lines · Linus Walleij
Quoted 5 lines · Jingoo Han

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled.

Quoted 6 lines
Quoted 4 lines

drivers/mfd/ab8500-gpadc.c:891:12: warning: 'ab8500_gpadc_suspend' defined but not used [-Wunused-function] drivers/mfd/ab8500-gpadc.c:903:12: warning: 'ab8500_gpadc_resume' defined but not used [-Wunused-function]

Signed-off-by Jingoo Han <[email protected]>
Acked-by Linus Walleij <[email protected]>

Applied the Ack.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog