Merge branch 'for-4.1/sensor-hub' into for-linus

[cascardo/linux.git] / drivers / iio / light / hid-sensor-prox.c

diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index db9c60e..91ecc46 100644 (file)
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -75,7 +75,6 @@ static int prox_read_raw(struct iio_dev *indio_dev,
        int report_id = -1;
        u32 address;
        int ret_type;
-       s32 poll_value;
 
        *val = 0;
        *val2 = 0;
@@ -92,16 +91,8 @@ static int prox_read_raw(struct iio_dev *indio_dev,
                        break;
                }
                if (report_id >= 0) {
-                       poll_value = hid_sensor_read_poll_value(
-                                       &prox_state->common_attributes);
-                       if (poll_value < 0)
-                               return -EINVAL;
-
                        hid_sensor_power_state(&prox_state->common_attributes,
                                                true);
-
-                       msleep_interruptible(poll_value * 2);
-
                        *val = sensor_hub_input_attr_get_raw_value(
                                prox_state->common_attributes.hsdev,
                                HID_USAGE_SENSOR_PROX, address,
@@ -374,6 +365,7 @@ static struct platform_driver hid_prox_platform_driver = {
        .id_table = hid_prox_ids,
        .driver = {
                .name   = KBUILD_MODNAME,
+               .pm     = &hid_sensor_pm_ops,
        },
        .probe          = hid_prox_probe,
        .remove         = hid_prox_remove,