4 files changed, 11 insertions, 112 deletions

diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index 15607b45221a..519392763393 100644
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
@@ -21,6 +21,8 @@ struct iio_buffer;
  * struct iio_buffer_access_funcs - access functions for buffers.
  * @store_to:           actually store stuff to the buffer
  * @read_first_n:       try to get a specified number of bytes (must exist)
+ * @data_available:     indicates whether data for reading from the buffer is
+ *                      available.
  * @request_update:     if a parameter change has been marked, update underlying
  *                      storage.
  * @get_bytes_per_datum:get current bytes per datum
@@ -43,6 +45,7 @@ struct iio_buffer_access_funcs {
         int (*read_first_n)(struct iio_buffer *buffer,
                             size_t n,
                             char __user *buf);
+        bool (*data_available)(struct iio_buffer *buffer);
 
         int (*request_update)(struct iio_buffer *buffer);
 
diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h
index 5dab2c41031f..8bbd7bc1043d 100644
--- a/include/linux/iio/events.h
+++ b/include/linux/iio/events.h
@@ -46,10 +46,6 @@ struct iio_event_data {
          ((u16)chan))
 
 
-#define IIO_EV_DIR_MAX 4
-#define IIO_EV_BIT(type, direction)                     \
-        (1 << (type*IIO_EV_DIR_MAX + direction))
-
 /**
  * IIO_MOD_EVENT_CODE() - create event identifier for modified channels
  * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 256a90a1bea6..75a8a20c8179 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -185,7 +185,6 @@ struct iio_event_spec {
  *                      by all channels of the same direction.
  * @info_mask_shared_by_all: What information is to be exported that is shared
  *                      by all channels.
- * @event_mask:         What events can this channel produce.
  * @event_spec:         Array of events which should be registered for this
  *                      channel.
  * @num_event_specs:    Size of the event_spec array.
@@ -226,7 +225,6 @@ struct iio_chan_spec {
         long                    info_mask_shared_by_type;
         long                    info_mask_shared_by_dir;
         long                    info_mask_shared_by_all;
-        long                    event_mask;
         const struct iio_event_spec *event_spec;
         unsigned int            num_event_specs;
         const struct iio_chan_spec_ext_info *ext_info;
@@ -307,16 +305,8 @@ struct iio_dev;
  *                      returns IIO_VAL_INT_PLUS_MICRO.
  * @read_event_config:  find out if the event is enabled.
  * @write_event_config: set if the event is enabled.
- * @read_event_value:   read a value associated with the event. Meaning
- *                      is event dependant. event_code specifies which event.
- * @write_event_value:  write the value associated with the event.
- *                      Meaning is event dependent.
- * @read_event_config_new: find out if the event is enabled. New style interface.
- * @write_event_config_new: set if the event is enabled. New style interface.
- * @read_event_value_new: read a configuration value associated with the event.
- *                         New style interface.
- * @write_event_value_new: write a configuration value for the event. New style
- *                         interface.
+ * @read_event_value:   read a configuration value associated with the event.
+ * @write_event_value:  write a configuration value for the event.
  * @validate_trigger:   function to validate the trigger when the
  *                      current trigger gets changed.
  * @update_scan_mode:   function to configure device and scan buffer when
@@ -345,37 +335,23 @@ struct iio_info {
                          long mask);
 
         int (*read_event_config)(struct iio_dev *indio_dev,
-                                 u64 event_code);
-
-        int (*write_event_config)(struct iio_dev *indio_dev,
-                                  u64 event_code,
-                                  int state);
-
-        int (*read_event_value)(struct iio_dev *indio_dev,
-                                u64 event_code,
-                                int *val);
-        int (*write_event_value)(struct iio_dev *indio_dev,
-                                 u64 event_code,
-                                 int val);
-
-        int (*read_event_config_new)(struct iio_dev *indio_dev,
                                  const struct iio_chan_spec *chan,
                                  enum iio_event_type type,
                                  enum iio_event_direction dir);
 
-        int (*write_event_config_new)(struct iio_dev *indio_dev,
+        int (*write_event_config)(struct iio_dev *indio_dev,
                                   const struct iio_chan_spec *chan,
                                   enum iio_event_type type,
                                   enum iio_event_direction dir,
                                   int state);
 
-        int (*read_event_value_new)(struct iio_dev *indio_dev,
+        int (*read_event_value)(struct iio_dev *indio_dev,
                                 const struct iio_chan_spec *chan,
                                 enum iio_event_type type,
                                 enum iio_event_direction dir,
                                 enum iio_event_info info, int *val, int *val2);
 
-        int (*write_event_value_new)(struct iio_dev *indio_dev,
+        int (*write_event_value)(struct iio_dev *indio_dev,
                                  const struct iio_chan_spec *chan,
                                  enum iio_event_type type,
                                  enum iio_event_direction dir,
@@ -490,32 +466,12 @@ struct iio_dev {
 #endif
 };
 
-/**
- * iio_find_channel_from_si() - get channel from its scan index
- * @indio_dev:          device
- * @si:                 scan index to match
- */
 const struct iio_chan_spec
 *iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
-
-/**
- * iio_device_register() - register a device with the IIO subsystem
- * @indio_dev:          Device structure filled by the device driver
- **/
 int iio_device_register(struct iio_dev *indio_dev);
-
-/**
- * iio_device_unregister() - unregister a device from the IIO subsystem
- * @indio_dev:          Device structure representing the device.
- **/
 void iio_device_unregister(struct iio_dev *indio_dev);
-
-/**
- * iio_push_event() - try to add event to the list for userspace reading
- * @indio_dev:          IIO device structure
- * @ev_code:            What event
- * @timestamp:          When the event occurred
- **/
+int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev);
+void devm_iio_device_unregister(struct device *dev, struct iio_dev *indio_dev);
 int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);
 
 extern struct bus_type iio_bus_type;
@@ -579,10 +535,6 @@ static inline void *iio_device_get_drvdata(struct iio_dev *indio_dev)
 
 /* Can we make this smaller? */
 #define IIO_ALIGN L1_CACHE_BYTES
-/**
- * iio_device_alloc() - allocate an iio_dev from a driver
- * @sizeof_priv:        Space to allocate for private structure.
- **/
 struct iio_dev *iio_device_alloc(int sizeof_priv);
 
 static inline void *iio_priv(const struct iio_dev *indio_dev)
@@ -596,64 +548,11 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv)
                                   ALIGN(sizeof(struct iio_dev), IIO_ALIGN));
 }
 
-/**
- * iio_device_free() - free an iio_dev from a driver
- * @indio_dev:          the iio_dev associated with the device
- **/
 void iio_device_free(struct iio_dev *indio_dev);
-
-/**
- * devm_iio_device_alloc - Resource-managed iio_device_alloc()
- * @dev:                Device to allocate iio_dev for
- * @sizeof_priv:        Space to allocate for private structure.
- *
- * Managed iio_device_alloc.  iio_dev allocated with this function is
- * automatically freed on driver detach.
- *
- * If an iio_dev allocated with this function needs to be freed separately,
- * devm_iio_device_free() must be used.
- *
- * RETURNS:
- * Pointer to allocated iio_dev on success, NULL on failure.
- */
 struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv);
-
-/**
- * devm_iio_device_free - Resource-managed iio_device_free()
- * @dev:                Device this iio_dev belongs to
- * @indio_dev:          the iio_dev associated with the device
- *
- * Free iio_dev allocated with devm_iio_device_alloc().
- */
 void devm_iio_device_free(struct device *dev, struct iio_dev *indio_dev);
-
-/**
- * devm_iio_trigger_alloc - Resource-managed iio_trigger_alloc()
- * @dev:                Device to allocate iio_trigger for
- * @fmt:                trigger name format. If it includes format
- *                      specifiers, the additional arguments following
- *                      format are formatted and inserted in the resulting
- *                      string replacing their respective specifiers.
- *
- * Managed iio_trigger_alloc.  iio_trigger allocated with this function is
- * automatically freed on driver detach.
- *
- * If an iio_trigger allocated with this function needs to be freed separately,
- * devm_iio_trigger_free() must be used.
- *
- * RETURNS:
- * Pointer to allocated iio_trigger on success, NULL on failure.
- */
 struct iio_trigger *devm_iio_trigger_alloc(struct device *dev,
                                                 const char *fmt, ...);
-
-/**
- * devm_iio_trigger_free - Resource-managed iio_trigger_free()
- * @dev:                Device this iio_dev belongs to
- * @iio_trig:           the iio_trigger associated with the device
- *
- * Free iio_trigger allocated with devm_iio_trigger_alloc().
- */
 void devm_iio_trigger_free(struct device *dev, struct iio_trigger *iio_trig);
 
 /**
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 4ac928ee31c5..084d882fe01b 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -29,6 +29,7 @@ enum iio_chan_type {
         IIO_ALTVOLTAGE,
         IIO_CCT,
         IIO_PRESSURE,
+        IIO_HUMIDITYRELATIVE,
 };
 
 enum iio_modifier {