aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baluta <daniel.baluta@intel.com>2015-01-09 04:39:30 -0500
committerJonathan Cameron <jic23@kernel.org>2015-01-20 17:00:19 -0500
commitdf1fad80dfa0a7644b525c4a0dd8f2be21f57358 (patch)
tree010808f59b9862fc5c166eb1fa8bb4d544ae46f1
parent0a01db9d64350754f5d714d44dab81cb97a67a81 (diff)
iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
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> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/imu/kmx61.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index b60b22d25615..5cc3692acf37 100644
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -747,7 +747,7 @@ static int kmx61_setup_any_motion_interrupt(struct kmx61_data *data,
747 */ 747 */
748static int kmx61_set_power_state(struct kmx61_data *data, bool on, u8 device) 748static int kmx61_set_power_state(struct kmx61_data *data, bool on, u8 device)
749{ 749{
750#ifdef CONFIG_PM_RUNTIME 750#ifdef CONFIG_PM
751 int ret; 751 int ret;
752 752
753 if (device & KMX61_ACC) { 753 if (device & KMX61_ACC) {
@@ -1531,7 +1531,7 @@ static int kmx61_resume(struct device *dev)
1531} 1531}
1532#endif 1532#endif
1533 1533
1534#ifdef CONFIG_PM_RUNTIME 1534#ifdef CONFIG_PM
1535static int kmx61_runtime_suspend(struct device *dev) 1535static int kmx61_runtime_suspend(struct device *dev)
1536{ 1536{
1537 struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev)); 1537 struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev));