Merge branch 'omap-for-v3.17/dt' into omap-for-v3.18/dt

[sfrench/cifs-2.6.git] / include / linux / hid-sensor-hub.h

diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
index b70cfd7ff29cab61123e537b03583d927692e6e5..51f7ccadf923c337ddb5627491a958c5e74fa610 100644 (file)
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
@@ -189,7 +189,7 @@ struct hid_sensor_common {
        struct hid_sensor_hub_device *hsdev;
        struct platform_device *pdev;
        unsigned usage_id;
-       bool data_ready;
+       atomic_t data_ready;
        struct iio_trigger *trigger;
        struct hid_sensor_hub_attribute_info poll;
        struct hid_sensor_hub_attribute_info report_state;
@@ -223,4 +223,10 @@ int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
 int hid_sensor_get_usage_index(struct hid_sensor_hub_device *hsdev,
                                u32 report_id, int field_index, u32 usage_id);
 
+int hid_sensor_format_scale(u32 usage_id,
+                           struct hid_sensor_hub_attribute_info *attr_info,
+                           int *val0, int *val1);
+
+s32 hid_sensor_read_poll_value(struct hid_sensor_common *st);
+
 #endif