From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: alsa-devel@alsa-project.org, vkoul@kernel.org
Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org,
tiwai@suse.de, broonie@kernel.org, gregkh@linuxfoundation.org,
jank@cadence.com, srinivas.kandagatla@linaro.org,
rander.wang@linux.intel.com, ranjani.sridharan@linux.intel.com,
hui.wang@canonical.com, pierre-louis.bossart@linux.intel.com,
sanyog.r.kale@intel.com, mengdong.lin@intel.com,
bard.liao@intel.com
Subject: [PATCH] soundwire: intel: fix CONFIG_PM and CONFIG_PM_SLEEP confusion
Date: Thu, 20 Aug 2020 22:04:41 +0800 [thread overview]
Message-ID: <20200820140441.9478-1-yung-chuan.liao@linux.intel.com> (raw)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
When CONFIG_PM_SLEEP is not defined, GCC throws compilation warnings:
drivers/soundwire/intel.c:1816:12: warning: ‘intel_resume’ defined but
not used [-Wunused-function]
1816 | static int intel_resume(struct device *dev)
| ^~~~~~~~~~~~
drivers/soundwire/intel.c:1697:12: warning: ‘intel_suspend’ defined
but not used [-Wunused-function]
1697 | static int intel_suspend(struct device *dev)
Fix by adding the missing CONFIG_PM_SLEEP.
Note that we could move code around and use only 2 ifdefs, but this
will generate conflicts so let's do this when all the pm handling is
merged.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
drivers/soundwire/intel.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index dbcbe2708563..a2f0026cb2c1 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -1525,7 +1525,7 @@ int intel_master_process_wakeen_event(struct platform_device *pdev)
* PM calls
*/
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int intel_suspend(struct device *dev)
{
@@ -1562,6 +1562,9 @@ static int intel_suspend(struct device *dev)
return 0;
}
+#endif
+
+#ifdef CONFIG_PM
static int intel_suspend_runtime(struct device *dev)
{
@@ -1624,6 +1627,9 @@ static int intel_suspend_runtime(struct device *dev)
return ret;
}
+#endif
+
+#ifdef CONFIG_PM_SLEEP
static int intel_resume(struct device *dev)
{
@@ -1691,6 +1697,9 @@ static int intel_resume(struct device *dev)
return ret;
}
+#endif
+
+#ifdef CONFIG_PM
static int intel_resume_runtime(struct device *dev)
{
@@ -1797,7 +1806,6 @@ static int intel_resume_runtime(struct device *dev)
return ret;
}
-
#endif
static const struct dev_pm_ops intel_pm = {
--
2.17.1
next reply other threads:[~2020-08-21 1:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 14:04 Bard Liao [this message]
2020-08-21 5:01 ` Vinod Koul
2020-08-21 15:23 ` Pierre-Louis Bossart
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=20200820140441.9478-1-yung-chuan.liao@linux.intel.com \
--to=yung-chuan.liao@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=bard.liao@intel.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hui.wang@canonical.com \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mengdong.lin@intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=vinod.koul@linaro.org \
--cc=vkoul@kernel.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
all inboxes | Powered by JetHome®