diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-09 14:34:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-09 14:34:13 +0000 |
| commit | eec8ae7a547037b498ba9e9159905090255e0197 (patch) | |
| tree | 33c568114f9904266cb2b2905148f8c6f499761f /include | |
| parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff) | |
| parent | bdc39644b5b42568499496a9fbd99a29ebf1f776 (diff) | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index e55907804d39..1f6643ce216a 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -122,9 +122,9 @@ typedef void (*regmap_unlock)(void *); * volatile_table (see below) is not, the check is performed on * such table (a register is volatile if it belongs to one of * the ranges specified by volatile_table). - * @precious_reg: Optional callback returning true if the rgister + * @precious_reg: Optional callback returning true if the register * should not be read outside of a call from the driver - * (eg, a clear on read interrupt status register). If this + * (e.g., a clear on read interrupt status register). If this * field is NULL but precious_table (see below) is not, the * check is performed on such table (a register is precious if * it belongs to one of the ranges specified by precious_table). @@ -136,9 +136,9 @@ typedef void (*regmap_unlock)(void *); * are not overridden). * @reg_read: Optional callback that if filled will be used to perform * all the reads from the registers. Should only be provided for - * devices whos read operation cannot be represented as a simple read - * operation on a bus such as SPI, I2C, etc. Most of the devices do - * not need this. + * devices whose read operation cannot be represented as a simple + * read operation on a bus such as SPI, I2C, etc. Most of the + * devices do not need this. * @reg_write: Same as above for writing. * @fast_io: Register IO is fast. Use a spinlock instead of a mutex * to perform locking. This field is ignored if custom lock/unlock |