From: Daniel Baluta <daniel.baluta@intel.com>
To: gregkh@linuxfoundation.org, jic23@kernel.org
Cc: linux-iio@vger.kernel.org, rafael.j.wysocki@intel.com
Subject: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Date: Fri, 9 Jan 2015 11:39:30 +0200 [thread overview]
Message-ID: <1420796370-12158-1-git-send-email-daniel.baluta@intel.com> (raw)
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.
Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
drivers/iio/imu/kmx61.c
Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
---
This fixes build break when merging iio patches for 3.20
into Greg's tree.
http://marc.info/?l=linux-iio&m=142077015029632&w=2
drivers/iio/imu/kmx61.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 841b033..4e2605e 100644
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -735,7 +735,7 @@ static int kmx61_setup_any_motion_interrupt(struct kmx61_data *data,
*/
static int kmx61_set_power_state(struct kmx61_data *data, bool on, u8 device)
{
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
int ret;
if (device & KMX61_ACC) {
@@ -1523,7 +1523,7 @@ static int kmx61_resume(struct device *dev)
}
#endif
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int kmx61_runtime_suspend(struct device *dev)
{
struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev));
--
1.9.1
next reply other threads:[~2015-01-09 9:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-09 9:39 Daniel Baluta [this message]
2015-01-10 10:32 ` [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Jonathan Cameron
2015-01-10 17:30 ` Greg KH
2015-01-15 21:01 ` Jonathan Cameron
2015-01-10 18:11 ` Jonathan Cameron
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=1420796370-12158-1-git-send-email-daniel.baluta@intel.com \
--to=daniel.baluta@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
/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).