From: ulf.hansson@linaro.org (Ulf Hansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 7/8] [media] exynos-gsc: Make system PM callbacks available for CONFIG_PM_SLEEP
Date: Mon, 19 Jan 2015 14:22:39 +0100 [thread overview]
Message-ID: <1421673760-2600-8-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1421673760-2600-1-git-send-email-ulf.hansson@linaro.org>
There are no need to set up the system PM callbacks unless they are
being used. It also causes compiler warnings about unused functions.
Silence the warnings by making them available for CONFIG_PM_SLEEP.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/media/platform/exynos-gsc/gsc-core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 0b126eb..194f9fc 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1188,6 +1188,7 @@ static int gsc_runtime_suspend(struct device *dev)
}
#endif
+#ifdef CONFIG_PM_SLEEP
static int gsc_resume(struct device *dev)
{
struct gsc_dev *gsc = dev_get_drvdata(dev);
@@ -1224,10 +1225,10 @@ static int gsc_suspend(struct device *dev)
return 0;
}
+#endif
static const struct dev_pm_ops gsc_pm_ops = {
- .suspend = gsc_suspend,
- .resume = gsc_resume,
+ SET_SYSTEM_SLEEP_PM_OPS(gsc_suspend, gsc_resume)
SET_RUNTIME_PM_OPS(gsc_runtime_suspend, gsc_runtime_resume, NULL)
};
--
1.9.1
next prev parent reply other threads:[~2015-01-19 13:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-19 13:22 [PATCH V2 0/8] [media] exynos-gsc: Fixup PM support Ulf Hansson
2015-01-19 13:22 ` [PATCH V2 1/8] [media] exynos-gsc: Simplify clock management Ulf Hansson
2015-01-19 13:22 ` [PATCH V2 2/8] [media] exynos-gsc: Convert gsc_m2m_resume() from int to void Ulf Hansson
2015-01-19 13:22 ` [PATCH V2 3/8] [media] exynos-gsc: Make driver functional when CONFIG_PM is unset Ulf Hansson
2015-01-19 13:22 ` [PATCH V2 4/8] [media] exynos-gsc: Make runtime PM callbacks available for CONFIG_PM Ulf Hansson
2015-01-19 13:22 ` [PATCH V2 5/8] [media] exynos-gsc: Fixup clock management at ->remove() Ulf Hansson
2015-01-19 13:22 ` [PATCH V2 6/8] [media] exynos-gsc: Do full clock gating at runtime PM suspend Ulf Hansson
2015-01-19 13:22 ` Ulf Hansson [this message]
2015-01-19 13:22 ` [PATCH V2 8/8] [media] exynos-gsc: Simplify system PM Ulf Hansson
2015-03-02 12:28 ` [PATCH V2 0/8] [media] exynos-gsc: Fixup PM support Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421673760-2600-8-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).