diff --git a/arch b/arch
index af40d035321..cb55e304769 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit af40d03532135c9010c508336828cd09c3c9b273
+Subproject commit cb55e3047693dca56aaf2aaa2e932f6b83d148c5
diff --git a/drivers/i2c/i2c_read.c b/drivers/i2c/i2c_read.c
index 54291dc1aad..83b0e681b28 100644
--- a/drivers/i2c/i2c_read.c
+++ b/drivers/i2c/i2c_read.c
@@ -51,10 +51,9 @@
  * Name: i2c_read
  *
  * Description:
- *   Receive a block of data from I2C using the previously selected I2C
- *   frequency and slave address. Each read operational will be an 'atomic'
- *   operation in the sense that any other I2C actions will be serialized
- *   and pend until this read completes. Required.
+ *   Receive a block of data from I2C. Each read operation will be an
+ *   'atomic' operation in the sense that any other I2C actions will be
+ *   serialized and pend until this read completes.
  *
  * Input Parameters:
  *   dev    - Device-specific state data
diff --git a/drivers/i2c/i2c_write.c b/drivers/i2c/i2c_write.c
index f72bc97a33d..0638486d657 100644
--- a/drivers/i2c/i2c_write.c
+++ b/drivers/i2c/i2c_write.c
@@ -51,7 +51,7 @@
  * Name: i2c_write
  *
  * Description:
- *   Send a block of data on I2C. Each write operational will be an 'atomic'
+ *   Send a block of data on I2C. Each write operation will be an 'atomic'
  *   operation in the sense that any other I2C actions will be serialized
  *   and pend until this write completes.
  *
diff --git a/drivers/i2c/i2c_writeread.c b/drivers/i2c/i2c_writeread.c
index 1b5c2060c56..d5a09fd9e0b 100644
--- a/drivers/i2c/i2c_writeread.c
+++ b/drivers/i2c/i2c_writeread.c
@@ -51,8 +51,8 @@
  * Name: i2c_writeread
  *
  * Description:
- *   Send a block of data on I2C using the previously, followed by restarted
- *   read access.  This provides a convenient wrapper to the transfer function.
+ *   Send a block of data on I2C followed by restarted read access.  This
+ *   provides a convenient wrapper to the transfer function.
  *
  * Input Parameters:
  *   dev     - Device-specific state data
diff --git a/include/nuttx/i2c/i2c_master.h b/include/nuttx/i2c/i2c_master.h
index 2b9271dced5..657703099f1 100644
--- a/include/nuttx/i2c/i2c_master.h
+++ b/include/nuttx/i2c/i2c_master.h
@@ -90,9 +90,7 @@
  *   will be serialized and pend until this sequence of transfers completes.
  *
  * Input Parameters:
- *   dev  
-
- - Device-specific state data
+ *   dev   - Device-specific state data
  *   msgs  - A pointer to a set of message descriptors
  *   count - The number of transfers to perform
  *
@@ -218,8 +216,8 @@ int up_i2creset(FAR struct i2c_master_s *dev);
  * Name: i2c_writeread
  *
  * Description:
- *   Send a block of data on I2C using the previously, followed by restarted
- *   read access.  This provides a convenient wrapper to the transfer function.
+ *   Send a block of data on I2C followed by restarted read access.  This
+ *   provides a convenient wrapper to the transfer function.
  *
  * Input Parameters:
  *   dev     - Device-specific state data
@@ -234,7 +232,8 @@ int up_i2creset(FAR struct i2c_master_s *dev);
  *
  ****************************************************************************/
 
-int i2c_writeread(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *config,
+int i2c_writeread(FAR struct i2c_master_s *dev,
+                  FAR const struct i2c_config_s *config,
                   FAR const uint8_t *wbuffer, int wbuflen,
                   FAR uint8_t *rbuffer, int rbuflen);
 
@@ -242,7 +241,7 @@ int i2c_writeread(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *c
  * Name: i2c_write
  *
  * Description:
- *   Send a block of data on I2C. Each write operational will be an 'atomic'
+ *   Send a block of data on I2C. Each write operation will be an 'atomic'
  *   operation in the sense that any other I2C actions will be serialized
  *   and pend until this write completes.
  *
@@ -257,17 +256,17 @@ int i2c_writeread(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *c
  *
  ****************************************************************************/
 
-int i2c_write(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *config,
+int i2c_write(FAR struct i2c_master_s *dev,
+              FAR const struct i2c_config_s *config,
               FAR const uint8_t *buffer, int buflen);
 
 /****************************************************************************
  * Name: i2c_read
  *
  * Description:
- *   Receive a block of data from I2C using the previously selected I2C
- *   frequency and slave address. Each read operational will be an 'atomic'
- *   operation in the sense that any other I2C actions will be serialized
- *   and pend until this read completes. Required.
+ *   Receive a block of data from I2C. Each read operation will be an
+ *   'atomic' operation in the sense that any other I2C actions will be
+ *   serialized and pend until this read completes.
  *
  * Input Parameters:
  *   dev    - Device-specific state data
@@ -279,7 +278,8 @@ int i2c_write(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *confi
  *
  ****************************************************************************/
 
-int i2c_read(FAR struct i2c_master_s *dev, FAR const struct i2c_config_s *config,
+int i2c_read(FAR struct i2c_master_s *dev,
+             FAR const struct i2c_config_s *config,
              FAR uint8_t *buffer, int buflen);
 
 #undef EXTERN