diff --git a/arch b/arch
index 0dfea1d68b..97d205c697 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 0dfea1d68b55f7d8378d422eb4875acc59867077
+Subproject commit 97d205c697886d4e28fbc785d373bb17541f11dd
diff --git a/include/nuttx/i2c/i2c_master.h b/include/nuttx/i2c/i2c_master.h
index 868dad15b9..1938bcbfa1 100644
--- a/include/nuttx/i2c/i2c_master.h
+++ b/include/nuttx/i2c/i2c_master.h
@@ -171,7 +171,7 @@ struct i2c_config_s
 {
   uint32_t frequency;          /* I2C frequency */
   uint16_t address;            /* I2C address (7- or 10-bit) */
-  uint8_t  addrlen;            /* I2C address length (7 or 10 bits) */
+  uint8_t addrlen;             /* I2C address length (7 or 10 bits) */
 };
 
 /* I2C transaction segment beginning with a START.  A number of these can
@@ -181,11 +181,11 @@ struct i2c_config_s
 
 struct i2c_msg_s
 {
-  uint32_t  frequency;         /* I2C frequency */
-  uint16_t  addr;              /* Slave address (7- or 10-bit) */
-  uint16_t  flags;             /* See I2C_M_* definitions */
-  uint8_t  *buffer;            /* Buffer to be transferred */
-  ssize_t   length;            /* Length of the buffer in bytes */
+  uint32_t frequency;         /* I2C frequency */
+  uint16_t addr;              /* Slave address (7- or 10-bit) */
+  uint16_t flags;             /* See I2C_M_* definitions */
+  FAR uint8_t *buffer;        /* Buffer to be transferred */
+  ssize_t length;             /* Length of the buffer in bytes */
 };
 
 /* I2C private data.  This structure only defines the initial fields of the
@@ -195,7 +195,7 @@ struct i2c_msg_s
 
 struct i2c_master_s
 {
-  const struct i2c_ops_s *ops; /* I2C vtable */
+  FAR const struct i2c_ops_s *ops; /* I2C vtable */
 };
 
 /* This structure is used to communicate with the I2C character driver in