]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
iio: accel: BMC150: fix issues when CONFIG_PM_RUNTIME is not set
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Fri, 29 Aug 2014 08:38:00 +0000 (09:38 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 30 Aug 2014 10:44:26 +0000 (11:44 +0100)
When CONFIG_PM_RUNTIME is not set, the following issues are seen:
 * warning message at compilation time:
    warning: 'bmc150_accel_get_startup_times' defined but not used [-Wunused-function]
 * bmc150_accel_set_power_state() will always fail and reading the
   accelerometer data is impossible;
   This occurs because of the call to pm_runtime_put_autosuspend calls
   __pm_runtime_suspend which returns -ENOSYS.

This commit fixes these.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/accel/bmc150-accel.c

index ccb6cf83f5f5ad8260abf147ff38dc4799dbeca2..0e6566adca2405a716938883fe1da899aa488119 100644 (file)
@@ -499,6 +499,7 @@ static int bmc150_accel_get_bw(struct bmc150_accel_data *data, int *val,
        return -EINVAL;
 }
 
+#ifdef CONFIG_PM_RUNTIME
 static int bmc150_accel_get_startup_times(struct bmc150_accel_data *data)
 {
        int i;
@@ -529,6 +530,12 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)
 
        return 0;
 }
+#else
+static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)
+{
+       return 0;
+}
+#endif
 
 static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val)
 {