nuttx: fix multiple 'FAR', 'CODE' and style issues

Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>

Documentation/reference/user/10_filesystem.rst

@@ -67,11 +67,11 @@ Driver Operations
 .. c:function:: int     dup(int fd);
 .. c:function:: int     dup2(int fd1, int fd2);
 .. c:function:: off_t   lseek(int fd, off_t offset, int whence);
-.. c:function:: ssize_t pread(int fd, void *buf, size_t nbytes, off_t offset);
+.. c:function:: ssize_t pread(int fd, FAR void *buf, size_t nbytes, off_t offset);
-.. c:function:: ssize_t pwrite(int fd, const void *buf, size_t nbytes, off_t offset);
+.. c:function:: ssize_t pwrite(int fd, FAR const void *buf, size_t nbytes, off_t offset);
 .. c:function:: ssize_t read(int fd, void *buf, size_t nbytes);
-.. c:function:: int     unlink(const char *path);
+.. c:function:: int     unlink(FAR const char *path);
-.. c:function:: ssize_t write(int fd, const void *buf, size_t nbytes);
+.. c:function:: ssize_t write(int fd, FAR const void *buf, size_t nbytes);
 
 ``sys/ioctl.h``
 ---------------
@@ -81,7 +81,7 @@ Driver Operations
 ``poll.h``
 ----------
 
-.. c:function:: int poll(struct pollfd *fds, nfds_t nfds, int timeout)
+.. c:function:: int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
 
   Waits for one of a set of file descriptors
   to become ready to perform I/O. If none of the events requested (and no

arch/arm/include/spinlock.h

@@ -118,7 +118,7 @@ typedef uint8_t spinlock_t;
     && !defined(CONFIG_ARCH_CHIP_LC823450) \
     && !defined(CONFIG_ARCH_CHIP_CXD56XX) \
     && !defined(CONFIG_ARCH_CHIP_RP2040)
-static inline_function spinlock_t up_testset(FAR volatile spinlock_t *lock)
+static inline_function spinlock_t up_testset(volatile spinlock_t *lock)
 {
   spinlock_t ret = SP_UNLOCKED;
 

arch/arm/src/stm32/stm32_eth.c

@@ -4304,7 +4304,7 @@ int up_rtc_initialize(void)
  *
  ****************************************************************************/
 
-int up_rtc_gettime(FAR struct timespec *tp)
+int up_rtc_gettime(struct timespec *tp)
 {
   uint64_t timestamp;
   timestamp = stm32_eth_ptp_gettime();
@@ -4340,7 +4340,7 @@ int up_rtc_gettime(FAR struct timespec *tp)
  *
  ****************************************************************************/
 
-int up_rtc_settime(FAR const struct timespec *tp)
+int up_rtc_settime(const struct timespec *tp)
 {
   struct timespec ptptime;
   uint64_t timestamp;

arch/arm64/include/spinlock.h

@@ -87,7 +87,7 @@
 typedef uint64_t spinlock_t;
 
 #if defined(CONFIG_ARCH_HAVE_TESTSET)
-static inline_function spinlock_t up_testset(FAR volatile spinlock_t *lock)
+static inline_function spinlock_t up_testset(volatile spinlock_t *lock)
 {
   spinlock_t ret = SP_LOCKED;
 

arch/arm64/src/imx9/imx9_dma_alloc.c

@@ -139,12 +139,12 @@ void imx9_dma_free(void *memory, size_t size)
 }
 
 #ifdef CONFIG_FAT_DMAMEMORY
-FAR void *fat_dma_alloc(size_t size)
+void *fat_dma_alloc(size_t size)
 {
   return imx9_dma_alloc(size);
 }
 
-void fat_dma_free(FAR void *memory, size_t size)
+void fat_dma_free(void *memory, size_t size)
 {
   imx9_dma_free(memory, size);
 }

arch/risc-v/include/spinlock.h

@@ -105,7 +105,7 @@ typedef uintptr_t spinlock_t;
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_RV_ISA_A)
-static inline_function spinlock_t up_testset(FAR volatile spinlock_t *lock)
+static inline_function spinlock_t up_testset(volatile spinlock_t *lock)
 {
   spinlock_t ret = SP_UNLOCKED;
 

arch/risc-v/src/bl808/bl808_timer.c

@@ -80,18 +80,18 @@ struct bl808_timer_ch_s
  * Private Function Prototypes
  ****************************************************************************/
 
-int bl808_timer_start(FAR struct timer_lowerhalf_s *lower);
+int bl808_timer_start(struct timer_lowerhalf_s *lower);
-int bl808_timer_stop(FAR struct timer_lowerhalf_s *lower);
+int bl808_timer_stop(struct timer_lowerhalf_s *lower);
-int bl808_timer_getstatus(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_getstatus(struct timer_lowerhalf_s *lower,
-                          FAR struct timer_status_s *status);
+                          struct timer_status_s *status);
-int bl808_timer_settimeout(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_settimeout(struct timer_lowerhalf_s *lower,
                            uint32_t timeout);
-void bl808_timer_setcallback(FAR struct timer_lowerhalf_s *lower,
+void bl808_timer_setcallback(struct timer_lowerhalf_s *lower,
-                            CODE tccb_t callback, FAR void *arg);
+                            tccb_t callback, void *arg);
-int bl808_timer_ioctl(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_ioctl(struct timer_lowerhalf_s *lower,
                       int cmd, unsigned long arg);
-int bl808_timer_maxtimeout(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_maxtimeout(struct timer_lowerhalf_s *lower,
-                           FAR uint32_t *maxtimeout);
+                           uint32_t *maxtimeout);
 
 /****************************************************************************
  * Private Data
@@ -215,7 +215,7 @@ static int __timer_interrupt(int irq, void *context, void *arg)
  *
  ****************************************************************************/
 
-int bl808_timer_start(FAR struct timer_lowerhalf_s *lower)
+int bl808_timer_start(struct timer_lowerhalf_s *lower)
 {
   struct bl808_timer_ch_s *priv = (struct bl808_timer_ch_s *)lower;
   if (TIMER_GET_CH(priv->blk_ch) == 0)
@@ -269,7 +269,7 @@ int bl808_timer_start(FAR struct timer_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-int bl808_timer_stop(FAR struct timer_lowerhalf_s *lower)
+int bl808_timer_stop(struct timer_lowerhalf_s *lower)
 {
   struct bl808_timer_ch_s *priv = (struct bl808_timer_ch_s *)lower;
 
@@ -304,8 +304,8 @@ int bl808_timer_stop(FAR struct timer_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-int bl808_timer_getstatus(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_getstatus(struct timer_lowerhalf_s *lower,
-                          FAR struct timer_status_s *status)
+                          struct timer_status_s *status)
 {
   struct bl808_timer_ch_s *priv = (struct bl808_timer_ch_s *)lower;
   uint32_t current_count;
@@ -338,7 +338,7 @@ int bl808_timer_getstatus(FAR struct timer_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-int bl808_timer_settimeout(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_settimeout(struct timer_lowerhalf_s *lower,
                            uint32_t timeout)
 {
   struct bl808_timer_ch_s *priv = (struct bl808_timer_ch_s *)lower;
@@ -408,8 +408,8 @@ int bl808_timer_settimeout(FAR struct timer_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-void bl808_timer_setcallback(FAR struct timer_lowerhalf_s *lower,
+void bl808_timer_setcallback(struct timer_lowerhalf_s *lower,
-                            CODE tccb_t callback, FAR void *arg)
+                             tccb_t callback, void *arg)
 {
   struct bl808_timer_ch_s *priv = (struct bl808_timer_ch_s *)lower;
   priv->callback = callback;
@@ -424,7 +424,7 @@ void bl808_timer_setcallback(FAR struct timer_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-int bl808_timer_ioctl(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_ioctl(struct timer_lowerhalf_s *lower,
                       int cmd, unsigned long arg)
 {
   /* No additional ioctl commands implemented */
@@ -441,8 +441,8 @@ int bl808_timer_ioctl(FAR struct timer_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-int bl808_timer_maxtimeout(FAR struct timer_lowerhalf_s *lower,
+int bl808_timer_maxtimeout(struct timer_lowerhalf_s *lower,
-                           FAR uint32_t *maxtimeout)
+                           uint32_t *maxtimeout)
 {
   /* Timer comparators are 32-bit */
 

arch/risc-v/src/bl808/bl808_wdt.c

@@ -72,16 +72,16 @@ struct bl808_wdt_s
  * Private Function Prototypes
  ****************************************************************************/
 
-int bl808_wdt_start(FAR struct watchdog_lowerhalf_s *lower);
+int bl808_wdt_start(struct watchdog_lowerhalf_s *lower);
-int bl808_wdt_stop(FAR struct watchdog_lowerhalf_s *lower);
+int bl808_wdt_stop(struct watchdog_lowerhalf_s *lower);
-int bl808_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower);
+int bl808_wdt_keepalive(struct watchdog_lowerhalf_s *lower);
-int bl808_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+int bl808_wdt_getstatus(struct watchdog_lowerhalf_s *lower,
-                          FAR struct watchdog_status_s *status);
+                        struct watchdog_status_s *status);
-int bl808_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+int bl808_wdt_settimeout(struct watchdog_lowerhalf_s *lower,
                          uint32_t timeout);
-xcpt_t bl808_wdt_capture(FAR struct watchdog_lowerhalf_s *lower,
+xcpt_t bl808_wdt_capture(struct watchdog_lowerhalf_s *lower,
-                       CODE xcpt_t callback);
+                         xcpt_t callback);
-int bl808_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower,
+int bl808_wdt_ioctl(struct watchdog_lowerhalf_s *lower,
                     int cmd, unsigned long arg);
 
 /****************************************************************************
@@ -161,7 +161,7 @@ static int __wdt_interrupt(int irq, void *context, void *arg)
  *
  ****************************************************************************/
 
-int bl808_wdt_start(FAR struct watchdog_lowerhalf_s *lower)
+int bl808_wdt_start(struct watchdog_lowerhalf_s *lower)
 {
   struct bl808_wdt_s *priv = (struct bl808_wdt_s *)lower;
 
@@ -196,7 +196,7 @@ int bl808_wdt_start(FAR struct watchdog_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-int bl808_wdt_stop(FAR struct watchdog_lowerhalf_s *lower)
+int bl808_wdt_stop(struct watchdog_lowerhalf_s *lower)
 {
   struct bl808_wdt_s *priv = (struct bl808_wdt_s *)lower;
 
@@ -228,7 +228,7 @@ int bl808_wdt_stop(FAR struct watchdog_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-int bl808_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower)
+int bl808_wdt_keepalive(struct watchdog_lowerhalf_s *lower)
 {
   struct bl808_wdt_s *priv = (struct bl808_wdt_s *)lower;
 
@@ -263,8 +263,8 @@ int bl808_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-int bl808_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+int bl808_wdt_getstatus(struct watchdog_lowerhalf_s *lower,
-                          FAR struct watchdog_status_s *status)
+                        struct watchdog_status_s *status)
 {
   struct bl808_wdt_s *priv = (struct bl808_wdt_s *)lower;
 
@@ -295,7 +295,7 @@ int bl808_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-int bl808_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+int bl808_wdt_settimeout(struct watchdog_lowerhalf_s *lower,
                          uint32_t timeout)
 {
   struct bl808_wdt_s *priv = (struct bl808_wdt_s *)lower;
@@ -342,8 +342,8 @@ int bl808_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-xcpt_t bl808_wdt_capture(FAR struct watchdog_lowerhalf_s *lower,
+xcpt_t bl808_wdt_capture(struct watchdog_lowerhalf_s *lower,
-                         CODE xcpt_t callback)
+                         xcpt_t callback)
 {
   struct bl808_wdt_s *priv = (struct bl808_wdt_s *)lower;
   xcpt_t prev_callback = priv->callback;
@@ -396,7 +396,7 @@ xcpt_t bl808_wdt_capture(FAR struct watchdog_lowerhalf_s *lower,
  *
  ****************************************************************************/
 
-int bl808_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower,
+int bl808_wdt_ioctl(struct watchdog_lowerhalf_s *lower,
                     int cmd, unsigned long arg)
 {
   /* No additional ioctl commands implemented */

arch/risc-v/src/common/espressif/esp_mcpwm.c

@@ -154,13 +154,13 @@ struct mcpwm_motor_lowerhalf_s
 {
   /* The following block is part of the upper-half device struct */
 
-  FAR const struct motor_ops_s *ops;    /* Arch-specific operations */
+  const struct motor_ops_s *ops;    /* Arch-specific operations */
   uint8_t                  opmode;  /* Motor operation mode */
   uint8_t                  opflags; /* Motor operation flags */
   struct motor_limits_s    limits;  /* Motor absolute limits */
   struct motor_params_s    param;   /* Motor settings */
   struct motor_state_s     state;   /* Motor state */
-  FAR void                     *priv;   /* Private data */
+  void                     *priv;   /* Private data */
 
   /* The following is private to the ESP MCPWM driver */
 

arch/risc-v/src/common/espressif/esp_rmt.c

@@ -224,8 +224,8 @@ struct rmt_dev_lowerhalf_s
 {
   /* The following block is part of the upper-half device struct */
 
-  FAR const struct rmt_ops_s *ops;
+  const struct rmt_ops_s *ops;
-  FAR struct circbuf_s       *circbuf;
+  struct circbuf_s       *circbuf;
   sem_t                  *recvsem;
   int                     minor;
 
@@ -338,8 +338,8 @@ static int rmt_write_items(rmt_channel_t channel,
                            bool wait_tx_done);
 static ssize_t esp_rmt_read(struct rmt_dev_s *dev, char *buffer,
                             size_t buflen);
-static ssize_t esp_rmt_write(FAR struct rmt_dev_s *dev,
+static ssize_t esp_rmt_write(struct rmt_dev_s *dev,
-                             FAR const char *buffer,
+                             const char *buffer,
                              size_t buflen);
 static struct rmt_dev_s
     *esp_rmtinitialize(struct rmt_channel_config_s config);

arch/risc-v/src/common/espressif/esp_temperature_sensor.c

@@ -110,8 +110,8 @@ static void esp_temp_sensor_register(struct esp_temp_priv_s *priv);
 static int esp_temperature_sensor_install(struct esp_temp_priv_s *priv,
   struct esp_temp_sensor_config_t cfg);
 static void esp_temperature_sensor_uninstall(struct esp_temp_priv_s *priv);
-static int esp_temperature_sensor_get_celsius(FAR struct file *filep,
+static int esp_temperature_sensor_get_celsius(struct file *filep,
-                                              FAR char *buffer,
+                                              char *buffer,
                                               size_t buflen);
 
 /****************************************************************************
@@ -444,14 +444,14 @@ static void esp_temperature_sensor_uninstall(struct esp_temp_priv_s *priv)
  *
  ****************************************************************************/
 
-static int esp_temperature_sensor_get_celsius(FAR struct file *filep,
+static int esp_temperature_sensor_get_celsius(struct file *filep,
-                                              FAR char *buffer,
+                                              char *buffer,
                                               size_t buflen)
 {
   uint32_t tsens_out;
-  FAR struct inode *inode = filep->f_inode;
+  struct inode *inode = filep->f_inode;
-  FAR struct esp_temp_priv_s *priv  = inode->i_private;
+  struct esp_temp_priv_s *priv = inode->i_private;
-  FAR int *out = (FAR int *) buffer;
+  int *out = (int *)buffer;
 
   nxmutex_lock(&priv->lock);
   if (priv == NULL)

arch/risc-v/src/common/riscv_exception.c

@@ -97,7 +97,7 @@ static const char *g_reasons_str[RISCV_MAX_EXCEPTION + 1] =
 int riscv_exception(int mcause, void *regs, void *args)
 {
 #ifdef CONFIG_ARCH_KERNEL_STACK
-  FAR struct tcb_s *tcb = this_task();
+  struct tcb_s *tcb = this_task();
 #endif
   uintreg_t cause = mcause & RISCV_IRQ_MASK;
 

arch/risc-v/src/esp32c3-legacy/esp32c3_ice40.c

@@ -159,8 +159,7 @@ ice40_get_status(struct ice40_dev_s *dev)
  *
  ****************************************************************************/
 
-FAR struct ice40_dev_s *
+struct ice40_dev_s *esp32c3_ice40_initialize(const uint16_t cdone_gpio,
-esp32c3_ice40_initialize(const uint16_t cdone_gpio,
                                              const uint16_t crst_gpio,
                                              const uint16_t cs_gpio,
                                              const uint16_t spi_port)

arch/risc-v/src/qemu-rv/qemu_rv_irq.c

@@ -46,7 +46,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_RPTUN
-static int qemu_ipi_handler(int mcause, FAR void *regs, FAR void *args)
+static int qemu_ipi_handler(int mcause, void *regs, void *args)
 {
   /* Clear IPI (Inter-Processor-Interrupt) */
 

arch/sim/src/sim/sim_camera.c

@@ -92,7 +92,7 @@ static int sim_camera_data_start_capture(struct imgdata_s *data,
 static int sim_camera_data_stop_capture(struct imgdata_s *data);
 static int sim_camera_data_set_buf(struct imgdata_s *data,
                                    uint8_t nr_datafmts,
-                                   FAR imgdata_format_t *datafmts,
+                                   imgdata_format_t *datafmts,
                                    uint8_t *addr, uint32_t size);
 
 /****************************************************************************
@@ -261,7 +261,7 @@ static int sim_camera_data_validate_buf(uint8_t *addr, uint32_t size)
 
 static int sim_camera_data_set_buf(struct imgdata_s *data,
                                    uint8_t nr_datafmts,
-                                   FAR imgdata_format_t *datafmts,
+                                   imgdata_format_t *datafmts,
                                    uint8_t *addr, uint32_t size)
 {
   sim_camera_priv_t *priv = (sim_camera_priv_t *)data;

arch/sim/src/sim/sim_heap.c

@@ -301,7 +301,7 @@ void mm_free(struct mm_heap_s *heap, void *mem)
  *
  ****************************************************************************/
 
-void mm_free_delaylist(FAR struct mm_heap_s *heap)
+void mm_free_delaylist(struct mm_heap_s *heap)
 {
   if (heap)
     {

arch/sim/src/sim/sim_uart.c

@@ -669,10 +669,10 @@ static bool tty_txempty(struct uart_dev_s *dev)
 #endif
 
 #ifdef CONFIG_SIM_RAM_UART
-static int sim_uartram_register(FAR const char *devname, bool slave)
+static int sim_uartram_register(const char *devname, bool slave)
 {
   char name[NAME_MAX];
-  FAR struct uart_rambuf_s *shmem;
+  struct uart_rambuf_s *shmem;
 
   strlcpy(name, strrchr(devname, '/') + 1, NAME_MAX);
   shmem = host_allocshmem(name, sizeof(struct uart_rambuf_s) * 2, !slave);

arch/xtensa/src/common/espressif/esp_mcpwm.c

@@ -160,13 +160,13 @@ struct mcpwm_motor_lowerhalf_s
 {
   /* The following block is part of the upper-half device struct */
 
-  FAR const struct motor_ops_s *ops;    /* Arch-specific operations */
+  const struct motor_ops_s *ops;    /* Arch-specific operations */
   uint8_t                  opmode;  /* Motor operation mode */
   uint8_t                  opflags; /* Motor operation flags */
   struct motor_limits_s    limits;  /* Motor absolute limits */
   struct motor_params_s    param;   /* Motor settings */
   struct motor_state_s     state;   /* Motor state */
-  FAR void                     *priv;   /* Private data */
+  void                     *priv;   /* Private data */
 
   /* The following is private to the ESP MCPWM driver */
 
@@ -199,7 +199,7 @@ struct mcpwm_cap_channel_lowerhalf_s
 {
   /* The following block is part of the upper-half device struct */
 
-  FAR const struct cap_ops_s *ops;
+  const struct cap_ops_s *ops;
 
   /* The following is private to the ESP MCPWM driver */
 

arch/xtensa/src/common/espressif/esp_rmt.c

@@ -270,8 +270,8 @@ struct rmt_dev_lowerhalf_s
 {
   /* The following block is part of the upper-half device struct */
 
-  FAR const struct rmt_ops_s *ops;
+  const struct rmt_ops_s *ops;
-  FAR struct circbuf_s       *circbuf;
+  struct circbuf_s       *circbuf;
   sem_t                  *recvsem;
   int                     minor;
 
@@ -384,8 +384,8 @@ static int rmt_write_items(rmt_channel_t channel,
                            bool wait_tx_done);
 static ssize_t esp_rmt_read(struct rmt_dev_s *dev, char *buffer,
                               size_t buflen);
-static ssize_t esp_rmt_write(FAR struct rmt_dev_s *dev,
+static ssize_t esp_rmt_write(struct rmt_dev_s *dev,
-                             FAR const char *buffer,
+                             const char *buffer,
                              size_t buflen);
 static struct rmt_dev_s
     *esp_rmtinitialize(struct rmt_channel_config_s config);

arch/xtensa/src/common/espressif/esp_temperature_sensor.c

@@ -109,8 +109,8 @@ static void esp_temp_sensor_register(struct esp_temp_priv_s *priv);
 static int esp_temperature_sensor_install(struct esp_temp_priv_s *priv,
   struct esp_temp_sensor_config_t cfg);
 static void esp_temperature_sensor_uninstall(struct esp_temp_priv_s *priv);
-static int esp_temperature_sensor_get_celsius(FAR struct file *filep,
+static int esp_temperature_sensor_get_celsius(struct file *filep,
-                                              FAR char *buffer,
+                                              char *buffer,
                                               size_t buflen);
 
 /****************************************************************************
@@ -443,14 +443,14 @@ static void esp_temperature_sensor_uninstall(struct esp_temp_priv_s *priv)
  *
  ****************************************************************************/
 
-static int esp_temperature_sensor_get_celsius(FAR struct file *filep,
+static int esp_temperature_sensor_get_celsius(struct file *filep,
-                                              FAR char *buffer,
+                                              char *buffer,
                                               size_t buflen)
 {
   uint32_t tsens_out;
-  FAR struct inode *inode = filep->f_inode;
+  struct inode *inode = filep->f_inode;
-  FAR struct esp_temp_priv_s *priv  = inode->i_private;
+  struct esp_temp_priv_s *priv = inode->i_private;
-  FAR int *out = (FAR int *) buffer;
+  int *out = (int *)buffer;
 
   nxmutex_lock(&priv->lock);
   if (priv == NULL)

arch/xtensa/src/esp32/esp32_openeth.c

@@ -240,7 +240,7 @@ static inline void openeth_set_tx_desc_cnt(int tx_desc_cnt)
 
 static IRAM_ATTR int openeth_isr_handler(int irq, void *context, void *arg)
 {
-  FAR struct netdev_lowerhalf_s *dev = &g_openeth.dev;
+  struct netdev_lowerhalf_s *dev = &g_openeth.dev;
 
   uint32_t status = REG_READ(OPENETH_INT_SOURCE_REG);
 
@@ -261,9 +261,9 @@ static IRAM_ATTR int openeth_isr_handler(int irq, void *context, void *arg)
   return 0;
 }
 
-static FAR netpkt_t *openeth_receive(FAR struct netdev_lowerhalf_s *dev)
+static netpkt_t *openeth_receive(struct netdev_lowerhalf_s *dev)
 {
-  FAR netpkt_t *pkt = netpkt_alloc(dev, NETPKT_RX);
+  netpkt_t *pkt = netpkt_alloc(dev, NETPKT_RX);
 
   struct openeth_priv_s *priv = &g_openeth;
 
@@ -322,7 +322,7 @@ err:
  *
  ****************************************************************************/
 
-static int openeth_ifup(FAR struct netdev_lowerhalf_s *dev)
+static int openeth_ifup(struct netdev_lowerhalf_s *dev)
 {
   irqstate_t flags;
 
@@ -357,7 +357,7 @@ static int openeth_ifup(FAR struct netdev_lowerhalf_s *dev)
  *
  ****************************************************************************/
 
-static int openeth_ifdown(FAR struct netdev_lowerhalf_s *dev)
+static int openeth_ifdown(struct netdev_lowerhalf_s *dev)
 {
   irqstate_t flags;
 
@@ -376,10 +376,10 @@ static int openeth_ifdown(FAR struct netdev_lowerhalf_s *dev)
   return OK;
 }
 
-static int openeth_transmit(FAR struct netdev_lowerhalf_s *dev,
+static int openeth_transmit(struct netdev_lowerhalf_s *dev,
-                           FAR netpkt_t *pkt)
+                            netpkt_t *pkt)
 {
-  FAR struct openeth_priv_s *priv = (FAR struct openeth_priv_s *)dev;
+  struct openeth_priv_s *priv = (struct openeth_priv_s *)dev;
   unsigned int len = netpkt_getdatalen(dev, pkt);
 
   /*  In QEMU, there never is a TX operation in progress */
@@ -455,8 +455,8 @@ err:
 int esp32_openeth_initialize(void)
 {
   int ret;
-  FAR struct openeth_priv_s *priv = &g_openeth;
+  struct openeth_priv_s *priv = &g_openeth;
-  FAR struct netdev_lowerhalf_s *dev = &priv->dev;
+  struct netdev_lowerhalf_s *dev = &priv->dev;
 
   /* Sanity check */
 

arch/xtensa/src/esp32s3/esp32s3_textheap.c

@@ -191,7 +191,7 @@ bool up_textheap_heapmember(void *p)
  *
  ****************************************************************************/
 
-FAR void *up_textheap_data_address(FAR void *p)
+void *up_textheap_data_address(void *p)
 {
   uintptr_t addr = (uintptr_t)p;
   if (SOC_DIRAM_IRAM_LOW <= addr && addr < SOC_DIRAM_IRAM_HIGH)
@@ -206,7 +206,7 @@ FAR void *up_textheap_data_address(FAR void *p)
       addr -= EXTRAM_D_I_BUS_OFFSET;
     }
 
-  return (FAR void *)addr;
+  return (void *)addr;
 }
 
 /****************************************************************************
@@ -251,7 +251,7 @@ IRAM_ATTR void up_textheap_data_sync(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_USE_COPY_SECTION)
-int up_copy_section(FAR void *dest, FAR const void *src, size_t n)
+int up_copy_section(void *dest, const void *src, size_t n)
 {
   memcpy(up_textheap_data_address(dest), src, n);
 

binfmt/libelf/libelf_coredump.c

@@ -277,7 +277,7 @@ static void elf_emit_tcb_note(FAR struct elf_dumpinfo_s *cinfo,
     }
   else
     {
-      regs = (uintptr_t *)tcb->xcp.regs;
+      regs = (FAR uintptr_t *)tcb->xcp.regs;
     }
 
   if (regs != NULL)
@@ -290,8 +290,8 @@ static void elf_emit_tcb_note(FAR struct elf_dumpinfo_s *cinfo,
             }
           else
             {
-              status.pr_regs[i] =
+              status.pr_regs[i] = *(FAR uintptr_t *)
-                *(uintptr_t *)((uint8_t *)regs + g_tcbinfo.reg_off.p[i]);
+                  ((FAR uint8_t *)regs + g_tcbinfo.reg_off.p[i]);
             }
         }
     }

binfmt/libelf/libelf_ctors.c

@@ -164,7 +164,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
 
           for (i = 0; i < loadinfo->nctors; i++)
             {
-              FAR uintptr_t *ptr = (uintptr_t *)
+              FAR uintptr_t *ptr = (FAR uintptr_t *)
                    ((FAR void *)(&loadinfo->ctors)[i]);
 
               binfo("ctor %d: "

binfmt/libelf/libelf_dtors.c

@@ -165,7 +165,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
 
           for (i = 0; i < loadinfo->ndtors; i++)
             {
-              FAR uintptr_t *ptr = (uintptr_t *)
+              FAR uintptr_t *ptr = (FAR uintptr_t *)
                   ((FAR void *)(&loadinfo->dtors)[i]);
 
               binfo("dtor %d: "

binfmt/libelf/libelf_sections.c

@@ -204,7 +204,7 @@ int elf_loadphdrs(FAR struct elf_loadinfo_s *loadinfo)
 
   /* Allocate memory to hold a working copy of the program header table */
 
-  loadinfo->phdr = (FAR FAR Elf_Phdr *)kmm_malloc(phdrsize);
+  loadinfo->phdr = (FAR Elf_Phdr *)kmm_malloc(phdrsize);
   if (!loadinfo->phdr)
     {
       berr("Failed to allocate the program header table. Size: %ld\n",

binfmt/libnxflat/libnxflat_read.c

@@ -93,12 +93,12 @@ static inline void nxflat_dumpreaddata(FAR char *buffer, int buflen)
  *
  ****************************************************************************/
 
-int nxflat_read(struct nxflat_loadinfo_s *loadinfo, char *buffer,
+int nxflat_read(FAR struct nxflat_loadinfo_s *loadinfo, FAR char *buffer,
                 int readsize, int offset)
 {
   ssize_t   nbytes;      /* Number of bytes read */
   off_t     rpos;        /* Position returned by lseek */
-  char   *bufptr;      /* Next buffer location to read into */
+  FAR char *bufptr;      /* Next buffer location to read into */
   int       bytesleft;   /* Number of bytes of .data left to read */
   int       bytesread;   /* Total number of bytes read */
 

boards/arm/gd32f4/gd32f450zk-aiotbox/src/gd32f4xx_i2c.c

@@ -39,7 +39,7 @@
 #ifdef CONFIG_I2C
 void gd32_i2c_initialize(void)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   int ret;
   i2cinfo("Initialize I2c\n");
 

boards/arm/gd32f4/gd32f470zk-aiotbox/src/gd32f4xx_i2c.c

@@ -39,7 +39,7 @@
 #ifdef CONFIG_I2C
 void gd32_i2c_initialize(void)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   int ret;
   i2cinfo("Initialize I2c\n");
 

boards/arm/rp2040/common/src/rp2040_uniqueid.c

@@ -334,7 +334,7 @@ void rp2040_uniqueid_initialize(void)
  *
  ****************************************************************************/
 
-int board_uniqueid(FAR uint8_t *uniqueid)
+int board_uniqueid(uint8_t *uniqueid)
 {
   memcpy(uniqueid, g_uniqueid, CONFIG_BOARDCTL_UNIQUEID_SIZE);
   return OK;

boards/arm/samv7/common/src/sam_reset.c

@@ -52,7 +52,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_BOARDCTL_RESET_CAUSE
-int board_reset_cause(FAR struct boardioc_reset_cause_s *cause)
+int board_reset_cause(struct boardioc_reset_cause_s *cause)
 {
   int rst_cause;
 

boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c

@@ -191,7 +191,7 @@
 #ifdef CONFIG_I2C_DRIVER
 static void stm32_i2c_register(int bus)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   int ret;
 
   i2c = stm32_i2cbus_initialize(bus);

boards/arm/stm32/stm32f401rc-rs485/src/stm32_at24.c

@@ -56,7 +56,7 @@
 
 int stm32_at24_init(char *path)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   static bool initialized = false;
   int ret;
 

boards/arm/stm32h7/linum-stm32h753bi/src/stm32_at24.c

@@ -57,7 +57,7 @@
 
 int stm32_at24_init(char *path)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   static bool initialized = false;
   int ret;
 

boards/risc-v/mpfs/common/src/mpfs_emmcsd.c

@@ -42,7 +42,7 @@ static struct sdio_dev_s *g_sdio_dev;
  * Private Functions
  ****************************************************************************/
 
-static void partition_handler(FAR struct partition_s *part, FAR void *arg)
+static void partition_handler(struct partition_s *part, void *arg)
 {
   unsigned partition = *(int *)arg;
   char devname[] = "/dev/mmcsd0p0";

boards/risc-v/qemu-rv/rv-virt/src/qemu_rv_appinit.c

@@ -216,7 +216,7 @@ int board_power_off(int status)
 #if defined(CONFIG_BUILD_KERNEL) && ! defined(CONFIG_NUTTSBI)
   riscv_sbi_system_reset(SBI_SRST_TYPE_SHUTDOWN, SBI_SRST_REASON_NONE);
 #else
-  *(FAR volatile uint32_t *)QEMU_RV_RESET_BASE = QEMU_RV_RESET_DONE;
+  *(volatile uint32_t *)QEMU_RV_RESET_BASE = QEMU_RV_RESET_DONE;
 #endif
 
   UNUSED(status);

boards/xtensa/esp32s3/common/src/esp32s3_board_adc.c

@@ -59,7 +59,7 @@ static int board_adc_register(int channel)
 {
   int ret;
   char devname[12];
-  FAR struct adc_dev_s *adcdev;
+  struct adc_dev_s *adcdev;
 
   adcdev = kmm_malloc(sizeof(struct adc_dev_s));
   if (adcdev == NULL)

boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_touchsceen_gt911.c

@@ -344,7 +344,7 @@ static void gt911_event(struct gt911_dev_s *dev)
  *
  ****************************************************************************/
 
-static void gt911_worker(FAR void *arg)
+static void gt911_worker(void *arg)
 {
   int ret;
   struct gt911_dev_s *dev = (struct gt911_dev_s *)arg;

boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_board_touchsceen_tt21100.c

@@ -126,7 +126,7 @@ __attribute__((packed));
  * Private Function Prototypes
  ****************************************************************************/
 
-static void tt21100_worker(FAR void *arg);
+static void tt21100_worker(void *arg);
 
 /****************************************************************************
  * Private Data
@@ -244,7 +244,7 @@ static void tt21100_event(struct tt21100_dev_s *dev)
  *
  ****************************************************************************/
 
-static void tt21100_worker(FAR void *arg)
+static void tt21100_worker(void *arg)
 {
   int ret;
   struct i2c_msg_s msg;

crypto/cryptodev.c

@@ -110,7 +110,7 @@ static ssize_t cryptof_write(FAR struct file *filep,
 static int cryptof_ioctl(FAR struct file *filep,
                          int cmd, unsigned long arg);
 static int cryptof_poll(FAR struct file *filep,
-                        struct pollfd *fds, bool setup);
+                        FAR struct pollfd *fds, bool setup);
 static int cryptof_open(FAR struct file *filep);
 static int cryptof_close(FAR struct file *filep);
 
@@ -682,7 +682,7 @@ fail:
 /* ARGSUSED */
 
 static int cryptof_poll(FAR struct file *filep,
-                        struct pollfd *fds, bool setup)
+                        FAR struct pollfd *fds, bool setup)
 {
   return 0;
 }

drivers/1wire/ds28e17.c

@@ -919,7 +919,7 @@ FAR struct i2c_master_s *
     }
 
   nxrmutex_unlock(&master->devlock);
-  return (struct i2c_master_s *)inst;
+  return (FAR struct i2c_master_s *)inst;
 }
 
 /****************************************************************************

drivers/analog/adc.c

@@ -55,7 +55,7 @@ static int     adc_reset(FAR struct adc_dev_s *dev);
 static int     adc_receive(FAR struct adc_dev_s *dev, uint8_t ch,
                            int32_t data);
 static void    adc_notify(FAR struct adc_dev_s *dev);
-static int     adc_poll(FAR struct file *filep, struct pollfd *fds,
+static int     adc_poll(FAR struct file *filep, FAR struct pollfd *fds,
                         bool setup);
 static int     adc_reset_fifo(FAR struct adc_dev_s *dev);
 static int     adc_samples_on_read(FAR struct adc_dev_s *dev);
@@ -523,7 +523,8 @@ static void adc_notify(FAR struct adc_dev_s *dev)
  * Name: adc_poll
  ****************************************************************************/
 
-static int adc_poll(FAR struct file *filep, struct pollfd *fds, bool setup)
+static int adc_poll(FAR struct file *filep, FAR struct pollfd *fds,
+                    bool setup)
 {
   FAR struct inode     *inode = filep->f_inode;
   FAR struct adc_dev_s *dev   = inode->i_private;
@@ -583,7 +584,7 @@ static int adc_poll(FAR struct file *filep, struct pollfd *fds, bool setup)
     {
       /* This is a request to tear down the poll. */
 
-      struct pollfd **slot = (struct pollfd **)fds->priv;
+      FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
 
       /* Remove all memory of the poll setup */
 

drivers/analog/ads1255.c

@@ -457,7 +457,7 @@ static void adc_worker(FAR void *arg)
       /* Perform the data received callback */
 
       DEBUGASSERT(priv->cb->au_receive != NULL);
-      priv->cb->au_receive(&g_adcdev, priv->channel, *(int32_t *)buf);
+      priv->cb->au_receive(&g_adcdev, priv->channel, *(FAR int32_t *)buf);
     }
 
   /* Re-enable ADC interrupts */
@@ -473,7 +473,7 @@ static void adc_worker(FAR void *arg)
  *
  ****************************************************************************/
 
-static int adc_interrupt(int irq, void *context, FAR void *arg)
+static int adc_interrupt(int irq, FAR void *context, FAR void *arg)
 {
   FAR struct ads1255_dev_s *priv =
     (FAR struct ads1255_dev_s *)g_adcdev.ad_priv;

drivers/analog/ads7828.c

@@ -236,7 +236,7 @@ static int ads7828_readchannel(FAR struct ads7828_dev_s *priv,
       i2cmsg[1].flags = I2C_M_READ;
 
       uint16_t buf;
-      i2cmsg[1].buffer = (uint8_t *)(&buf);
+      i2cmsg[1].buffer = (FAR uint8_t *)(&buf);
       i2cmsg[1].length = sizeof(buf);
       ret = I2C_TRANSFER(priv->i2c, i2cmsg, 2);
       if (ret < 0)

drivers/analog/hx711.c

@@ -336,7 +336,7 @@ static int hx711_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     case HX711_GET_AVERAGE:
         {
-          unsigned *ptr = (unsigned *)((uintptr_t)arg);
+          FAR unsigned *ptr = (FAR unsigned *)((uintptr_t)arg);
           if (ptr == NULL)
             {
               ret = -EINVAL;
@@ -349,7 +349,7 @@ static int hx711_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     case HX711_GET_CHANNEL:
         {
-          char *ptr = (char *)((uintptr_t)arg);
+          FAR char *ptr = (FAR char *)((uintptr_t)arg);
           if (ptr == NULL)
             {
               ret = -EINVAL;
@@ -362,7 +362,7 @@ static int hx711_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     case HX711_GET_GAIN:
         {
-          unsigned char *ptr = (unsigned char *)((uintptr_t)arg);
+          FAR unsigned char *ptr = (FAR unsigned char *)((uintptr_t)arg);
           if (ptr == NULL)
             {
               ret = -EINVAL;
@@ -375,7 +375,7 @@ static int hx711_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     case HX711_GET_VAL_PER_UNIT:
         {
-          unsigned *ptr = (unsigned *)((uintptr_t)arg);
+          FAR unsigned *ptr = (FAR unsigned *)((uintptr_t)arg);
           if (ptr == NULL)
             {
               ret = -EINVAL;
@@ -388,7 +388,7 @@ static int hx711_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     case HX711_TARE:
         {
-          float *precision = (float *)((uintptr_t)arg);
+          FAR float *precision = (FAR float *)((uintptr_t)arg);
           if (precision == NULL)
             {
               ret = -EINVAL;
@@ -401,7 +401,7 @@ static int hx711_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     case HX711_SET_SIGN:
         {
-          int *sign = (int *)((uintptr_t)arg);
+          FAR int *sign = (FAR int *)((uintptr_t)arg);
           if (sign == NULL || (*sign != 1 && *sign != -1))
             {
               ret = EINVAL;

drivers/analog/max1161x.c

@@ -267,7 +267,7 @@ static int max1161x_readchannel(FAR struct max1161x_dev_s *priv,
       i2cmsg[2].flags = I2C_M_READ;
 
       uint16_t buf;
-      i2cmsg[2].buffer = (uint8_t *)(&buf);
+      i2cmsg[2].buffer = (FAR uint8_t *)(&buf);
       i2cmsg[2].length = sizeof(buf);
       ret = I2C_TRANSFER(priv->i2c, i2cmsg, 3);
       if (ret < 0)

drivers/audio/audio_dma.c

@@ -585,9 +585,9 @@ struct audio_lowerhalf_s *audio_dma_initialize(struct dma_dev_s *dma_dev,
   audio_dma->fifo_width = fifo_width;
 
   if (audio_dma->playback)
-    audio_dma->dst_addr = up_addrenv_va_to_pa((void *)fifo_addr);
+    audio_dma->dst_addr = up_addrenv_va_to_pa((FAR void *)fifo_addr);
   else
-    audio_dma->src_addr = up_addrenv_va_to_pa((void *)fifo_addr);
+    audio_dma->src_addr = up_addrenv_va_to_pa((FAR void *)fifo_addr);
 
   audio_dma->buffer_size = CONFIG_AUDIO_BUFFER_NUMBYTES;
   audio_dma->buffer_num  = CONFIG_AUDIO_NUM_BUFFERS;

drivers/audio/audio_i2s.c

@@ -38,7 +38,7 @@
 struct audio_i2s_s
 {
   struct audio_lowerhalf_s dev;
-  struct i2s_dev_s *i2s;
+  FAR struct i2s_dev_s *i2s;
   bool playback;
 };
 
@@ -91,7 +91,7 @@ static int audio_i2s_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
                                    FAR struct ap_buffer_s *apb);
 static int audio_i2s_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
                            unsigned long arg);
-static void audio_i2s_callback(struct i2s_dev_s *dev,
+static void audio_i2s_callback(FAR struct i2s_dev_s *dev,
                                FAR struct ap_buffer_s *apb, FAR void *arg,
                                int result);
 
@@ -130,7 +130,7 @@ static const struct audio_ops_s g_audio_i2s_ops =
 static int audio_i2s_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
                              FAR struct audio_caps_s *caps)
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   /* Validate the structure */
@@ -208,7 +208,7 @@ static int audio_i2s_configure(FAR struct audio_lowerhalf_s *dev,
                                FAR const struct audio_caps_s *caps)
 #endif
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s;
   int samprate;
   int nchannels;
@@ -257,7 +257,7 @@ static int audio_i2s_configure(FAR struct audio_lowerhalf_s *dev,
 
 static int audio_i2s_shutdown(FAR struct audio_lowerhalf_s *dev)
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_SHUTDOWN, audio_i2s->playback);
@@ -270,7 +270,7 @@ static int audio_i2s_start(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_start(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_START, audio_i2s->playback);
@@ -284,7 +284,7 @@ static int audio_i2s_stop(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_stop(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_STOP, audio_i2s->playback);
@@ -299,7 +299,7 @@ static int audio_i2s_pause(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_pause(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_PAUSE, audio_i2s->playback);
@@ -312,7 +312,7 @@ static int audio_i2s_resume(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_resume(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_RESUME, audio_i2s->playback);
@@ -322,7 +322,7 @@ static int audio_i2s_resume(FAR struct audio_lowerhalf_s *dev)
 static int audio_i2s_allocbuffer(FAR struct audio_lowerhalf_s *dev,
                                  FAR struct audio_buf_desc_s *bufdesc)
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_ALLOCBUFFER, (unsigned long)bufdesc);
@@ -331,7 +331,7 @@ static int audio_i2s_allocbuffer(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_freebuffer(FAR struct audio_lowerhalf_s *dev,
                                 FAR struct audio_buf_desc_s *bufdesc)
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, AUDIOIOC_FREEBUFFER, (unsigned long)bufdesc);
@@ -340,7 +340,7 @@ static int audio_i2s_freebuffer(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
                                    FAR struct ap_buffer_s *apb)
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   if (audio_i2s->playback)
@@ -356,7 +356,7 @@ static int audio_i2s_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 static int audio_i2s_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
                            unsigned long arg)
 {
-  FAR struct audio_i2s_s *audio_i2s = (struct audio_i2s_s *)dev;
+  FAR struct audio_i2s_s *audio_i2s = (FAR struct audio_i2s_s *)dev;
   FAR struct i2s_dev_s *i2s = audio_i2s->i2s;
 
   return I2S_IOCTL(i2s, cmd, arg);
@@ -370,7 +370,7 @@ static int audio_i2s_reserve(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
 #ifdef CONFIG_AUDIO_MULTI_SESSION
-  *session = (void *)audio_i2s->playback;
+  *session = (FAR void *)audio_i2s->playback;
 #endif
   return OK;
 }
@@ -385,7 +385,7 @@ static int audio_i2s_release(FAR struct audio_lowerhalf_s *dev)
   return OK;
 }
 
-static void audio_i2s_callback(struct i2s_dev_s *dev,
+static void audio_i2s_callback(FAR struct i2s_dev_s *dev,
                                FAR struct ap_buffer_s *apb,
                                FAR void *arg, int result)
 {

drivers/audio/audio_null.c

@@ -275,7 +275,7 @@ static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
 
               /* Report the Sample rates we support */
 
-              ptr  = (uint16_t *)caps->ac_controls.b;
+              ptr  = (FAR uint16_t *)caps->ac_controls.b;
               *ptr = AUDIO_SAMP_RATE_8K |
                      AUDIO_SAMP_RATE_11K |
                      AUDIO_SAMP_RATE_16K |

drivers/audio/cs4344.c

@@ -418,7 +418,7 @@ static int cs4344_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
 
               /* Report the Sample rates we support */
 
-              ptr  = (uint16_t *)caps->ac_controls.b;
+              ptr  = (FAR uint16_t *)caps->ac_controls.b;
               *ptr =
                 AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
                 AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |