diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-03 19:08:13 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-03 19:08:13 -0500 |
commit | 6f0a13f25e639b29ead0f7832c3ec56b0cc7f902 (patch) | |
tree | 29b9c587ecebbf73e7503e8532f89745f58ee323 | |
parent | 96a1c18a7b41b084dff5cf83383f46f264eeb84a (diff) |
iio / 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/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
-rw-r--r-- | drivers/iio/accel/bmc150-accel.c | 4 | ||||
-rw-r--r-- | drivers/iio/accel/kxcjk-1013.c | 4 | ||||
-rw-r--r-- | drivers/iio/gyro/bmg160.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c index 22c096ce39ad..e0565ed131bc 100644 --- a/drivers/iio/accel/bmc150-accel.c +++ b/drivers/iio/accel/bmc150-accel.c | |||
@@ -510,7 +510,7 @@ static int bmc150_accel_get_bw(struct bmc150_accel_data *data, int *val, | |||
510 | return -EINVAL; | 510 | return -EINVAL; |
511 | } | 511 | } |
512 | 512 | ||
513 | #ifdef CONFIG_PM_RUNTIME | 513 | #ifdef CONFIG_PM |
514 | static int bmc150_accel_get_startup_times(struct bmc150_accel_data *data) | 514 | static int bmc150_accel_get_startup_times(struct bmc150_accel_data *data) |
515 | { | 515 | { |
516 | int i; | 516 | int i; |
@@ -1349,7 +1349,7 @@ static int bmc150_accel_resume(struct device *dev) | |||
1349 | } | 1349 | } |
1350 | #endif | 1350 | #endif |
1351 | 1351 | ||
1352 | #ifdef CONFIG_PM_RUNTIME | 1352 | #ifdef CONFIG_PM |
1353 | static int bmc150_accel_runtime_suspend(struct device *dev) | 1353 | static int bmc150_accel_runtime_suspend(struct device *dev) |
1354 | { | 1354 | { |
1355 | struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); | 1355 | struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); |
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index a23e58c4ed99..230679f5b962 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c | |||
@@ -358,7 +358,7 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data) | |||
358 | return 0; | 358 | return 0; |
359 | } | 359 | } |
360 | 360 | ||
361 | #ifdef CONFIG_PM_RUNTIME | 361 | #ifdef CONFIG_PM |
362 | static int kxcjk1013_get_startup_times(struct kxcjk1013_data *data) | 362 | static int kxcjk1013_get_startup_times(struct kxcjk1013_data *data) |
363 | { | 363 | { |
364 | int i; | 364 | int i; |
@@ -1357,7 +1357,7 @@ static int kxcjk1013_resume(struct device *dev) | |||
1357 | } | 1357 | } |
1358 | #endif | 1358 | #endif |
1359 | 1359 | ||
1360 | #ifdef CONFIG_PM_RUNTIME | 1360 | #ifdef CONFIG_PM |
1361 | static int kxcjk1013_runtime_suspend(struct device *dev) | 1361 | static int kxcjk1013_runtime_suspend(struct device *dev) |
1362 | { | 1362 | { |
1363 | struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); | 1363 | struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); |
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c index 1f967e0d688e..800865c55499 100644 --- a/drivers/iio/gyro/bmg160.c +++ b/drivers/iio/gyro/bmg160.c | |||
@@ -237,7 +237,7 @@ static int bmg160_chip_init(struct bmg160_data *data) | |||
237 | 237 | ||
238 | static int bmg160_set_power_state(struct bmg160_data *data, bool on) | 238 | static int bmg160_set_power_state(struct bmg160_data *data, bool on) |
239 | { | 239 | { |
240 | #ifdef CONFIG_PM_RUNTIME | 240 | #ifdef CONFIG_PM |
241 | int ret; | 241 | int ret; |
242 | 242 | ||
243 | if (on) | 243 | if (on) |
@@ -1164,7 +1164,7 @@ static int bmg160_resume(struct device *dev) | |||
1164 | } | 1164 | } |
1165 | #endif | 1165 | #endif |
1166 | 1166 | ||
1167 | #ifdef CONFIG_PM_RUNTIME | 1167 | #ifdef CONFIG_PM |
1168 | static int bmg160_runtime_suspend(struct device *dev) | 1168 | static int bmg160_runtime_suspend(struct device *dev) |
1169 | { | 1169 | { |
1170 | struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); | 1170 | struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); |