* [PATCH] MFD: ucb1x00-core: add CONFIG_PM_SLEEP to suspend/resume
@ 2013-08-02 5:45 Jingoo Han
2013-08-02 10:11 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Jingoo Han @ 2013-08-02 5:45 UTC (permalink / raw)
To: Samuel Ortiz, Lee Jones; +Cc: linux-kernel, Russell King, 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/ucb1x00-core.c:672:12: warning: 'ucb1x00_suspend' defined but not used [-Wunused-function]
drivers/mfd/ucb1x00-core.c:704:12: warning: 'ucb1x00_resume' defined but not used [-Wunused-function]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/mfd/ucb1x00-core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 70f02da..daec8c8 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -669,6 +669,7 @@ void ucb1x00_unregister_driver(struct ucb1x00_driver *drv)
mutex_unlock(&ucb1x00_mutex);
}
+#ifdef CONFIG_PM_SLEEP
static int ucb1x00_suspend(struct device *dev)
{
struct ucb1x00_plat_data *pdata = dev->platform_data;
@@ -736,6 +737,7 @@ static int ucb1x00_resume(struct device *dev)
mutex_unlock(&ucb1x00_mutex);
return 0;
}
+#endif
static const struct dev_pm_ops ucb1x00_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ucb1x00_suspend, ucb1x00_resume)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MFD: ucb1x00-core: add CONFIG_PM_SLEEP to suspend/resume
2013-08-02 5:45 [PATCH] MFD: ucb1x00-core: add CONFIG_PM_SLEEP to suspend/resume Jingoo Han
@ 2013-08-02 10:11 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2013-08-02 10:11 UTC (permalink / raw)
To: Jingoo Han; +Cc: Samuel Ortiz, linux-kernel, Russell King
On Fri, 02 Aug 2013, Jingoo Han wrote:
> 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/ucb1x00-core.c:672:12: warning: 'ucb1x00_suspend' defined but not used [-Wunused-function]
> drivers/mfd/ucb1x00-core.c:704:12: warning: 'ucb1x00_resume' defined but not used [-Wunused-function]
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> drivers/mfd/ucb1x00-core.c | 2 ++
> 1 file changed, 2 insertions(+)
Looks fine to me. Applied, thanks.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-02 10:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-02 5:45 [PATCH] MFD: ucb1x00-core: add CONFIG_PM_SLEEP to suspend/resume Jingoo Han
2013-08-02 10:11 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).