diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.c b/arch/arm/src/stm32l4/stm32l4_freerun.c
index 6ffda5ac21..1a653b4965 100644
--- a/arch/arm/src/stm32l4/stm32l4_freerun.c
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.c
@@ -57,7 +57,7 @@
  * Private Functions
  ****************************************************************************/
 
-static struct stm32l4_freerun_s *g_freerun;
+FAR static struct stm32l4_freerun_s *g_freerun;
 
 /****************************************************************************
  * Private Functions
@@ -81,9 +81,9 @@ static struct stm32l4_freerun_s *g_freerun;
  *
  ****************************************************************************/
 
-static int stm32l4_freerun_handler(int irq, void *context)
+static int stm32l4_freerun_handler(int irq, FAR void *context)
 {
-  struct stm32l4_freerun_s *freerun = g_freerun;
+  FAR struct stm32l4_freerun_s *freerun = g_freerun;
 
   DEBUGASSERT(freerun != NULL && freerun->overflow < UINT32_MAX);
   freerun->overflow++;
@@ -115,8 +115,8 @@ static int stm32l4_freerun_handler(int irq, void *context)
  *
  ****************************************************************************/
 
-int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
-                             uint16_t resolution)
+int stm32l4_freerun_initialize(FAR struct stm32l4_freerun_s *freerun, int chan,
+                               uint16_t resolution)
 {
   uint32_t frequency;
 
@@ -183,8 +183,8 @@ int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
  *
  ****************************************************************************/
 
-int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
-                          struct timespec *ts)
+int stm32l4_freerun_counter(FAR struct stm32l4_freerun_s *freerun,
+                            FAR struct timespec *ts)
 {
   uint64_t usec;
   uint32_t counter;
@@ -275,7 +275,7 @@ int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
  *
  ****************************************************************************/
 
-int stm32l4_freerun_uninitialize(struct stm32l4_freerun_s *freerun)
+int stm32l4_freerun_uninitialize(FAR struct stm32l4_freerun_s *freerun)
 {
   DEBUGASSERT(freerun && freerun->tch);
 
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c
index 221f023155..6c8027e15c 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.c
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c
@@ -83,11 +83,11 @@ static struct stm32l4_oneshot_s *g_oneshot;
  *
  ****************************************************************************/
 
-static int stm32l4_oneshot_handler(int irq, void *context)
+static int stm32l4_oneshot_handler(int irq, FAR void *context)
 {
-  struct stm32l4_oneshot_s *oneshot = g_oneshot;
+  FAR struct stm32l4_oneshot_s *oneshot = g_oneshot;
   oneshot_handler_t oneshot_handler;
-  void *oneshot_arg;
+  FAR void *oneshot_arg;
 
   tmrinfo("Expired...\n");
   DEBUGASSERT(oneshot != NULL && oneshot->handler);
@@ -138,8 +138,8 @@ static int stm32l4_oneshot_handler(int irq, void *context)
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
-                           uint16_t resolution)
+int stm32l4_oneshot_initialize(FAR struct stm32l4_oneshot_s *oneshot, int chan,
+                               uint16_t resolution)
 {
   uint32_t frequency;
 
@@ -181,7 +181,8 @@ int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
+int stm32l4_oneshot_max_delay(FAR struct stm32l4_oneshot_s *oneshot, 
+                              FAR uint64_t *usec)
 {
   DEBUGASSERT(oneshot != NULL && usec != NULL);
 
@@ -210,9 +211,9 @@ int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
-                        oneshot_handler_t handler, void *arg,
-                        const struct timespec *ts)
+int stm32l4_oneshot_start(FAR struct stm32l4_oneshot_s *oneshot,
+                          oneshot_handler_t handler, FAR void *arg,
+                          FAR const struct timespec *ts)
 {
   uint64_t usec;
   uint64_t period;
@@ -307,8 +308,8 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot,
-                         struct timespec *ts)
+int stm32l4_oneshot_cancel(FAR struct stm32l4_oneshot_s *oneshot,
+                           FAR struct timespec *ts)
 {
   irqstate_t flags;
   uint64_t usec;