Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / linux / iio / iio.h

diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index b5894118755fbf7441b1dfe6d7a623f46a8f370f..b2b16772c651001085a3e55a8b0712b32c193a0d 100644 (file)
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -180,18 +180,18 @@ struct iio_event_spec {
  * @address:           Driver specific identifier.
  * @scan_index:                Monotonic index to give ordering in scans when read
  *                     from a buffer.
- * @scan_type:         Sign:           's' or 'u' to specify signed or unsigned
+ * @scan_type:         sign:           's' or 'u' to specify signed or unsigned
  *                     realbits:       Number of valid bits of data
- *                     storage_bits:   Realbits + padding
+ *                     storagebits:    Realbits + padding
  *                     shift:          Shift right by this before masking out
  *                                     realbits.
- *                     endianness:     little or big endian
  *                     repeat:         Number of times real/storage bits
  *                                     repeats. When the repeat element is
  *                                     more than 1, then the type element in
  *                                     sysfs will show a repeat value.
  *                                     Otherwise, the number of repetitions is
  *                                     omitted.
+ *                     endianness:     little or big endian
  * @info_mask_separate: What information is to be exported that is specific to
  *                     this channel.
  * @info_mask_shared_by_type: What information is to be exported that is shared
@@ -448,7 +448,7 @@ struct iio_buffer_setup_ops {
  * @buffer:            [DRIVER] any buffer present
  * @buffer_list:       [INTERN] list of all buffers currently attached
  * @scan_bytes:                [INTERN] num bytes captured to be fed to buffer demux
- * @mlock:             [INTERN] lock used to prevent simultaneous device state
+ * @mlock:             [DRIVER] lock used to prevent simultaneous device state
  *                     changes
  * @available_scan_masks: [DRIVER] optional array of allowed bitmasks
  * @masklength:                [INTERN] the length of the mask established from