You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/04/17 15:42:46 UTC

[incubator-nuttx] 01/08: arch/xtensa: Remove FAR from chip and board folder

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 6bc61b5752d4e5b0870c2ba0707b13a38007ba48
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 20:36:19 2022 +0800

    arch/xtensa: Remove FAR from chip and board folder
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/xtensa/src/common/xtensa_backtrace.c          |  2 +-
 arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c    |  2 +-
 arch/xtensa/src/esp32/esp32_twai.c                 | 84 +++++++++++-----------
 arch/xtensa/src/esp32/esp32_twai.h                 |  2 +-
 .../xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c |  2 +-
 .../xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c |  2 +-
 boards/xtensa/esp32/common/src/esp32_board_i2c.c   |  2 +-
 boards/xtensa/esp32/common/src/esp32_board_spi.c   | 12 ++--
 .../xtensa/esp32/common/src/esp32_board_spidev.c   |  2 +-
 .../xtensa/esp32/common/src/esp32_board_spiflash.c | 14 ++--
 boards/xtensa/esp32/common/src/esp32_ili9341.c     | 52 +++++++-------
 .../xtensa/esp32/common/src/esp32_lcd_backpack.c   |  4 +-
 boards/xtensa/esp32/common/src/esp32_mcp2515.c     | 30 ++++----
 boards/xtensa/esp32/common/src/esp32_oneshot.c     |  2 +-
 boards/xtensa/esp32/common/src/esp32_ssd1306.c     |  6 +-
 boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c |  2 +-
 .../xtensa/esp32/esp32-devkitc/src/esp32_buttons.c |  2 +-
 boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c | 46 ++++++------
 .../esp32/esp32-ethernet-kit/src/esp32_boot.c      |  2 +-
 .../esp32/esp32-ethernet-kit/src/esp32_buttons.c   |  2 +-
 .../xtensa/esp32/esp32-wrover-kit/src/esp32_boot.c |  2 +-
 .../esp32/esp32-wrover-kit/src/esp32_buttons.c     |  2 +-
 .../xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c | 46 ++++++------
 .../xtensa/esp32/ttgo_lora_esp32/src/esp32_boot.c  |  2 +-
 .../esp32/ttgo_lora_esp32/src/esp32_buttons.c      |  2 +-
 .../xtensa/esp32/ttgo_lora_esp32/src/esp32_gpio.c  | 46 ++++++------
 .../esp32s2/esp32s2-saola-1/src/esp32s2_gpio.c     | 52 +++++++-------
 .../esp32s3/common/src/esp32s3_board_spiflash.c    | 10 +--
 .../esp32s3/esp32s3-devkit/src/esp32s3_buttons.c   |  2 +-
 29 files changed, 218 insertions(+), 218 deletions(-)

diff --git a/arch/xtensa/src/common/xtensa_backtrace.c b/arch/xtensa/src/common/xtensa_backtrace.c
index dbb43f1509..5096f0337e 100644
--- a/arch/xtensa/src/common/xtensa_backtrace.c
+++ b/arch/xtensa/src/common/xtensa_backtrace.c
@@ -233,7 +233,7 @@ int up_backtrace(struct tcb_s *tcb, void **buffer, int size, int skip)
       if (up_interrupt_context())
         {
 #if CONFIG_ARCH_INTERRUPTSTACK > 15
-          FAR void *istackbase;
+          void *istackbase;
 #ifdef CONFIG_SMP
           istackbase = xtensa_intstack_alloc();
 #else
diff --git a/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c b/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c
index 8cb8f0a7d2..21a9ddd3cf 100644
--- a/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c
+++ b/arch/xtensa/src/esp32/esp32_oneshot_lowerhalf.c
@@ -118,7 +118,7 @@ static void esp32_oneshot_lh_handler(void *arg)
   struct esp32_oneshot_lowerhalf_s *priv =
     (struct esp32_oneshot_lowerhalf_s *)arg;
   oneshot_callback_t callback;
-  FAR void *cb_arg;
+  void *cb_arg;
 
   DEBUGASSERT(priv != NULL);
   DEBUGASSERT(priv->callback != NULL);
diff --git a/arch/xtensa/src/esp32/esp32_twai.c b/arch/xtensa/src/esp32/esp32_twai.c
index ce5a3c0431..ac6c5905db 100644
--- a/arch/xtensa/src/esp32/esp32_twai.c
+++ b/arch/xtensa/src/esp32/esp32_twai.c
@@ -150,32 +150,32 @@ static void twai_putreg(uint32_t addr, uint32_t value);
 
 /* TWAI methods */
 
-static void esp32twai_reset(FAR struct can_dev_s *dev);
-static int  esp32twai_setup(FAR struct can_dev_s *dev);
-static void esp32twai_shutdown(FAR struct can_dev_s *dev);
-static void esp32twai_rxint(FAR struct can_dev_s *dev, bool enable);
-static void esp32twai_txint(FAR struct can_dev_s *dev, bool enable);
-static int  esp32twai_ioctl(FAR struct can_dev_s *dev, int cmd,
+static void esp32twai_reset(struct can_dev_s *dev);
+static int  esp32twai_setup(struct can_dev_s *dev);
+static void esp32twai_shutdown(struct can_dev_s *dev);
+static void esp32twai_rxint(struct can_dev_s *dev, bool enable);
+static void esp32twai_txint(struct can_dev_s *dev, bool enable);
+static int  esp32twai_ioctl(struct can_dev_s *dev, int cmd,
                            unsigned long arg);
-static int  esp32twai_remoterequest(FAR struct can_dev_s *dev,
+static int  esp32twai_remoterequest(struct can_dev_s *dev,
                                       uint16_t id);
-static int  esp32twai_send(FAR struct can_dev_s *dev,
-                             FAR struct can_msg_s *msg);
-static bool esp32twai_txready(FAR struct can_dev_s *dev);
-static bool esp32twai_txempty(FAR struct can_dev_s *dev);
+static int  esp32twai_send(struct can_dev_s *dev,
+                           struct can_msg_s *msg);
+static bool esp32twai_txready(struct can_dev_s *dev);
+static bool esp32twai_txempty(struct can_dev_s *dev);
 
 /* TWAI interrupts */
 
-static int esp32twai_interrupt(int irq, void *context, FAR void *arg);
+static int esp32twai_interrupt(int irq, void *context, void *arg);
 
 /* TWAI acceptance filter */
 
 static void esp32twai_set_acc_filter(uint32_t code, uint32_t mask,
-                                       bool single_filter);
+                                     bool single_filter);
 
 /* TWAI bit-timing initialization */
 
-static int twai_baud_rate(FAR struct twai_dev_s *priv, int rate, int clock,
+static int twai_baud_rate(struct twai_dev_s *priv, int rate, int clock,
     int sjw, int sampl_pt, int flags);
 
 /****************************************************************************
@@ -378,9 +378,9 @@ static void twai_putreg(uint32_t addr, uint32_t value)
  *
  ****************************************************************************/
 
-static void esp32twai_reset(FAR struct can_dev_s *dev)
+static void esp32twai_reset(struct can_dev_s *dev)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
   irqstate_t flags;
   int ret;
 
@@ -447,9 +447,9 @@ static void esp32twai_reset(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static int esp32twai_setup(FAR struct can_dev_s *dev)
+static int esp32twai_setup(struct can_dev_s *dev)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
   irqstate_t flags;
   int ret = OK;
 
@@ -517,9 +517,9 @@ static int esp32twai_setup(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static void esp32twai_shutdown(FAR struct can_dev_s *dev)
+static void esp32twai_shutdown(struct can_dev_s *dev)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
 
 #ifdef CONFIG_DEBUG_CAN_INFO
   caninfo("shutdown TWAI%" PRIu8 "\n", priv->port);
@@ -559,9 +559,9 @@ static void esp32twai_shutdown(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static void esp32twai_rxint(FAR struct can_dev_s *dev, bool enable)
+static void esp32twai_rxint(struct can_dev_s *dev, bool enable)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
   uint32_t regval;
   irqstate_t flags;
 
@@ -602,9 +602,9 @@ static void esp32twai_rxint(FAR struct can_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void esp32twai_txint(FAR struct can_dev_s *dev, bool enable)
+static void esp32twai_txint(struct can_dev_s *dev, bool enable)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
   uint32_t regval;
   irqstate_t flags;
 
@@ -648,10 +648,10 @@ static void esp32twai_txint(FAR struct can_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static int esp32twai_ioctl(FAR struct can_dev_s *dev, int cmd,
+static int esp32twai_ioctl(struct can_dev_s *dev, int cmd,
                            unsigned long arg)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
   int ret = -ENOTTY;
 
   caninfo("TWAI%" PRIu8 " cmd=%04x arg=%lu\n", priv->port, cmd, arg);
@@ -673,8 +673,8 @@ static int esp32twai_ioctl(FAR struct can_dev_s *dev, int cmd,
 
       case CANIOC_GET_BITTIMING:
         {
-          FAR struct canioc_bittiming_s *bt =
-            (FAR struct canioc_bittiming_s *)arg;
+          struct canioc_bittiming_s *bt =
+            (struct canioc_bittiming_s *)arg;
           uint32_t timing0;
           uint32_t timing1;
           uint32_t brp;
@@ -709,7 +709,7 @@ static int esp32twai_ioctl(FAR struct can_dev_s *dev, int cmd,
   return ret;
 }
 
-static int esp32twai_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
+static int esp32twai_remoterequest(struct can_dev_s *dev, uint16_t id)
 {
   canwarn("Remote request not implemented\n");
   return -ENOSYS;
@@ -739,10 +739,10 @@ static int esp32twai_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
  *
  ****************************************************************************/
 
-static int esp32twai_send(FAR struct can_dev_s *dev,
-                            FAR struct can_msg_s *msg)
+static int esp32twai_send(struct can_dev_s *dev,
+                          struct can_msg_s *msg)
 {
-  FAR struct twai_dev_s *priv = (FAR struct twai_dev_s *)dev->cd_priv;
+  struct twai_dev_s *priv = (struct twai_dev_s *)dev->cd_priv;
   uint32_t regval;
   uint32_t i;
   uint32_t len;
@@ -846,9 +846,9 @@ static int esp32twai_send(FAR struct can_dev_s *dev,
  *
  ****************************************************************************/
 
-static bool esp32twai_txready(FAR struct can_dev_s *dev)
+static bool esp32twai_txready(struct can_dev_s *dev)
 {
-  FAR struct twai_dev_s *priv = dev->cd_priv;
+  struct twai_dev_s *priv = dev->cd_priv;
   uint32_t regval = twai_getreg(TWAI_STATUS_REG);
 
   caninfo("TWAI%" PRIu8 " txready: %d\n", priv->port,
@@ -874,9 +874,9 @@ static bool esp32twai_txready(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static bool esp32twai_txempty(FAR struct can_dev_s *dev)
+static bool esp32twai_txempty(struct can_dev_s *dev)
 {
-  FAR struct twai_dev_s *priv = dev->cd_priv;
+  struct twai_dev_s *priv = dev->cd_priv;
   uint32_t regval = twai_getreg(TWAI_STATUS_REG);
 
   caninfo("TWAI%" PRIu8 " txempty: %d\n", priv->port,
@@ -900,10 +900,10 @@ static bool esp32twai_txempty(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static int esp32twai_interrupt(int irq, void *context, FAR void *arg)
+static int esp32twai_interrupt(int irq, void *context, void *arg)
 {
 #ifdef CONFIG_ESP32_TWAI0
-  FAR struct can_dev_s *dev = (FAR struct can_dev_s *)arg;
+  struct can_dev_s *dev = (struct can_dev_s *)arg;
   struct can_hdr_s hdr;
   uint8_t data[8];
   uint32_t frame_info;
@@ -1012,7 +1012,7 @@ static int esp32twai_interrupt(int irq, void *context, FAR void *arg)
  ****************************************************************************/
 
 static void esp32twai_set_acc_filter(uint32_t code, uint32_t mask,
-                                       bool single_filter)
+                                     bool single_filter)
 {
   uint32_t regval;
   uint32_t code_swapped = __builtin_bswap32(code);
@@ -1099,7 +1099,7 @@ static void esp32twai_set_acc_filter(uint32_t code, uint32_t mask,
 static int twai_baud_rate(struct twai_dev_s *priv, int rate, int clock,
                           int sjw, int sampl_pt, int flags)
 {
-  FAR const struct can_bittiming_const *timing =
+  const struct can_bittiming_const *timing =
       &esp32_twai_bittiming_const;
   int best_error = 1000000000;
   int error;
@@ -1208,9 +1208,9 @@ static int twai_baud_rate(struct twai_dev_s *priv, int rate, int clock,
  *
  ****************************************************************************/
 
-FAR struct can_dev_s *esp32_twaiinitialize(int port)
+struct can_dev_s *esp32_twaiinitialize(int port)
 {
-  FAR struct can_dev_s *twaidev;
+  struct can_dev_s *twaidev;
   irqstate_t flags;
 
   caninfo("TWAI%" PRIu8 "\n",  port);
diff --git a/arch/xtensa/src/esp32/esp32_twai.h b/arch/xtensa/src/esp32/esp32_twai.h
index 7a1d3d23d0..d147890680 100644
--- a/arch/xtensa/src/esp32/esp32_twai.h
+++ b/arch/xtensa/src/esp32/esp32_twai.h
@@ -66,7 +66,7 @@ extern "C"
 
 #if defined(CONFIG_CAN) && defined(CONFIG_ESP32_TWAI)
 struct can_dev_s;
-FAR struct can_dev_s *esp32_twaiinitialize(int port);
+struct can_dev_s *esp32_twaiinitialize(int port);
 #endif
 
 #ifdef __cplusplus
diff --git a/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c b/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c
index 78954b1001..f046c62d67 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_oneshot_lowerhalf.c
@@ -115,7 +115,7 @@ static void esp32s2_oneshot_lh_handler(void *arg)
   struct esp32s2_oneshot_lowerhalf_s *priv =
     (struct esp32s2_oneshot_lowerhalf_s *)arg;
   oneshot_callback_t callback;
-  FAR void *cb_arg;
+  void *cb_arg;
 
   DEBUGASSERT(priv != NULL);
   DEBUGASSERT(priv->callback != NULL);
diff --git a/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c b/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c
index bf5fa2414e..27a260ff2e 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_oneshot_lowerhalf.c
@@ -117,7 +117,7 @@ static void oneshot_lh_handler(void *arg)
   struct esp32s3_oneshot_lowerhalf_s *priv =
     (struct esp32s3_oneshot_lowerhalf_s *)arg;
   oneshot_callback_t callback;
-  FAR void *cb_arg;
+  void *cb_arg;
 
   DEBUGASSERT(priv != NULL);
   DEBUGASSERT(priv->callback != NULL);
diff --git a/boards/xtensa/esp32/common/src/esp32_board_i2c.c b/boards/xtensa/esp32/common/src/esp32_board_i2c.c
index 155aa03598..7e7a543261 100644
--- a/boards/xtensa/esp32/common/src/esp32_board_i2c.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_i2c.c
@@ -49,7 +49,7 @@
 
 int esp32_i2c_register(int bus)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   int ret;
 
   i2c = esp32_i2cbus_initialize(bus);
diff --git a/boards/xtensa/esp32/common/src/esp32_board_spi.c b/boards/xtensa/esp32/common/src/esp32_board_spi.c
index a9024473c6..5412b8edef 100644
--- a/boards/xtensa/esp32/common/src/esp32_board_spi.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_spi.c
@@ -41,7 +41,7 @@
  * Name: spi_status
  ****************************************************************************/
 
-static inline uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid)
+static inline uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid)
 {
   uint8_t status = 0;
 
@@ -68,7 +68,7 @@ static inline uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid)
 
 #ifdef CONFIG_SPI_CMDDATA
 
-static inline int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
+static inline int spi_cmddata(struct spi_dev_s *dev, uint32_t devid,
                               bool cmd)
 {
 #ifdef CONFIG_LCD_ILI9341
@@ -99,7 +99,7 @@ static inline int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
 
 #ifdef CONFIG_ESP32_SPI2
 
-uint8_t esp32_spi2_status(FAR struct spi_dev_s *dev, uint32_t devid)
+uint8_t esp32_spi2_status(struct spi_dev_s *dev, uint32_t devid)
 {
   return spi_status(dev, devid);
 }
@@ -112,7 +112,7 @@ uint8_t esp32_spi2_status(FAR struct spi_dev_s *dev, uint32_t devid)
 
 #if defined(CONFIG_ESP32_SPI2) && defined(CONFIG_SPI_CMDDATA)
 
-int esp32_spi2_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
+int esp32_spi2_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
 {
   spiinfo("devid: %" PRIu32 " CMD: %s\n", devid, cmd ? "command" :
           "data");
@@ -128,7 +128,7 @@ int esp32_spi2_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
 
 #ifdef CONFIG_ESP32_SPI3
 
-uint8_t esp32_spi3_status(FAR struct spi_dev_s *dev, uint32_t devid)
+uint8_t esp32_spi3_status(struct spi_dev_s *dev, uint32_t devid)
 {
   return spi_status(dev, devid);
 }
@@ -141,7 +141,7 @@ uint8_t esp32_spi3_status(FAR struct spi_dev_s *dev, uint32_t devid)
 
 #if defined(CONFIG_ESP32_SPI3) && defined(CONFIG_SPI_CMDDATA)
 
-int esp32_spi3_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
+int esp32_spi3_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
 {
   spiinfo("devid: %" PRIu32 " CMD: %s\n", devid, cmd ? "command" :
           "data");
diff --git a/boards/xtensa/esp32/common/src/esp32_board_spidev.c b/boards/xtensa/esp32/common/src/esp32_board_spidev.c
index 1dad836ada..0d7a5c2f94 100644
--- a/boards/xtensa/esp32/common/src/esp32_board_spidev.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_spidev.c
@@ -47,7 +47,7 @@
 int board_spidev_initialize(int port)
 {
   int ret;
-  FAR struct spi_dev_s *spi;
+  struct spi_dev_s *spi;
 
   spiinfo("Initializing /dev/spi%d...\n", port);
 
diff --git a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
index 5259cae63d..66bfcc0317 100644
--- a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
@@ -122,7 +122,7 @@ static const struct ota_partition_s g_ota_partition_table[] =
 #ifdef CONFIG_ESP32_HAVE_OTA_PARTITION
 static int init_ota_partitions(void)
 {
-  FAR struct mtd_dev_s *mtd;
+  struct mtd_dev_s *mtd;
 #ifdef CONFIG_BCH
   char blockdev[18];
 #endif
@@ -176,7 +176,7 @@ static int init_ota_partitions(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ESP32_SPIFLASH_SMARTFS
-static int setup_smartfs(int smartn, FAR struct mtd_dev_s *mtd,
+static int setup_smartfs(int smartn, struct mtd_dev_s *mtd,
                          const char *mnt_pt)
 {
   int ret = OK;
@@ -236,7 +236,7 @@ static int setup_smartfs(int smartn, FAR struct mtd_dev_s *mtd,
  ****************************************************************************/
 
 #ifdef CONFIG_ESP32_SPIFLASH_LITTLEFS
-static int setup_littlefs(const char *path, FAR struct mtd_dev_s *mtd,
+static int setup_littlefs(const char *path, struct mtd_dev_s *mtd,
                           const char *mnt_pt, int priv)
 {
   int ret = OK;
@@ -284,7 +284,7 @@ static int setup_littlefs(const char *path, FAR struct mtd_dev_s *mtd,
  ****************************************************************************/
 
 #ifdef CONFIG_ESP32_SPIFLASH_SPIFFS
-static int setup_spiffs(const char *path, FAR struct mtd_dev_s *mtd,
+static int setup_spiffs(const char *path, struct mtd_dev_s *mtd,
                         const char *mnt_pt, int priv)
 {
   int ret = OK;
@@ -326,7 +326,7 @@ static int setup_spiffs(const char *path, FAR struct mtd_dev_s *mtd,
  ****************************************************************************/
 
 #ifdef CONFIG_ESP32_SPIFLASH_NXFFS
-static int setup_nxffs(FAR struct mtd_dev_s *mtd, const char *mnt_pt)
+static int setup_nxffs(struct mtd_dev_s *mtd, const char *mnt_pt)
 {
   int ret = OK;
 
@@ -366,7 +366,7 @@ static int setup_nxffs(FAR struct mtd_dev_s *mtd, const char *mnt_pt)
 static int init_wifi_partition(void)
 {
   int ret = OK;
-  FAR struct mtd_dev_s *mtd;
+  struct mtd_dev_s *mtd;
 
   mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_WIFI_MTD_OFFSET,
                                      CONFIG_ESP32_WIFI_MTD_SIZE,
@@ -431,7 +431,7 @@ static int init_wifi_partition(void)
 static int init_storage_partition(void)
 {
   int ret = OK;
-  FAR struct mtd_dev_s *mtd;
+  struct mtd_dev_s *mtd;
 
   mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_STORAGE_MTD_OFFSET,
                                      CONFIG_ESP32_STORAGE_MTD_SIZE,
diff --git a/boards/xtensa/esp32/common/src/esp32_ili9341.c b/boards/xtensa/esp32/common/src/esp32_ili9341.c
index 995f055be1..ad92988397 100644
--- a/boards/xtensa/esp32/common/src/esp32_ili9341.c
+++ b/boards/xtensa/esp32/common/src/esp32_ili9341.c
@@ -82,19 +82,19 @@ struct ili93414ws_lcd_s
  * Private Function Protototypes
  ****************************************************************************/
 
-static void esp32_ili93414ws_select(FAR struct ili9341_lcd_s *lcd);
-static void esp32_ili93414ws_deselect(FAR struct ili9341_lcd_s *lcd);
-static int esp32_ili93414ws_backlight(FAR struct ili9341_lcd_s *lcd,
+static void esp32_ili93414ws_select(struct ili9341_lcd_s *lcd);
+static void esp32_ili93414ws_deselect(struct ili9341_lcd_s *lcd);
+static int esp32_ili93414ws_backlight(struct ili9341_lcd_s *lcd,
                                       int level);
-static int esp32_ili93414ws_sendcmd(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_sendcmd(struct ili9341_lcd_s *lcd,
                                     const uint8_t cmd);
-static int esp32_ili93414ws_sendparam(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_sendparam(struct ili9341_lcd_s *lcd,
                                       const uint8_t param);
-static int esp32_ili93414ws_sendgram(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_sendgram(struct ili9341_lcd_s *lcd,
                                      const uint16_t *wd, uint32_t nwords);
-static int esp32_ili93414ws_recvparam(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_recvparam(struct ili9341_lcd_s *lcd,
                                       uint8_t *param);
-static int esp32_ili93414ws_recvgram(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_recvgram(struct ili9341_lcd_s *lcd,
                                      uint16_t *wd, uint32_t nwords);
 
 /****************************************************************************
@@ -119,9 +119,9 @@ static struct lcd_dev_s *g_lcd = NULL;
  *
  ****************************************************************************/
 
-static void esp32_ili93414ws_select(FAR struct ili9341_lcd_s *lcd)
+static void esp32_ili93414ws_select(struct ili9341_lcd_s *lcd)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   SPI_LOCK(priv->spi, true);
   SPI_SELECT(priv->spi, SPIDEV_DISPLAY(0), true);
@@ -138,9 +138,9 @@ static void esp32_ili93414ws_select(FAR struct ili9341_lcd_s *lcd)
  *
  ****************************************************************************/
 
-static void esp32_ili93414ws_deselect(FAR struct ili9341_lcd_s *lcd)
+static void esp32_ili93414ws_deselect(struct ili9341_lcd_s *lcd)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   SPI_SELECT(priv->spi, SPIDEV_DISPLAY(0), false);
   SPI_LOCK(priv->spi, false);
@@ -168,7 +168,7 @@ static void esp32_ili93414ws_deselect(FAR struct ili9341_lcd_s *lcd)
  *
  ****************************************************************************/
 
-static int esp32_ili93414ws_backlight(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_backlight(struct ili9341_lcd_s *lcd,
                                       int level)
 {
   if (level > 0)
@@ -200,10 +200,10 @@ static int esp32_ili93414ws_backlight(FAR struct ili9341_lcd_s *lcd,
  *
  ****************************************************************************/
 
-static int esp32_ili93414ws_sendcmd(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_sendcmd(struct ili9341_lcd_s *lcd,
                                     const uint8_t cmd)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   lcdinfo("%02x\n", cmd);
 
@@ -231,10 +231,10 @@ static int esp32_ili93414ws_sendcmd(FAR struct ili9341_lcd_s *lcd,
  *
  ****************************************************************************/
 
-static int esp32_ili93414ws_sendparam(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_sendparam(struct ili9341_lcd_s *lcd,
                                       const uint8_t param)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   lcdinfo("param=%04x\n", param);
 
@@ -262,10 +262,10 @@ static int esp32_ili93414ws_sendparam(FAR struct ili9341_lcd_s *lcd,
  *
  ****************************************************************************/
 
-static int esp32_ili93414ws_sendgram(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_sendgram(struct ili9341_lcd_s *lcd,
                                      const uint16_t *wd, uint32_t nwords)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   lcdinfo("lcd:%p, wd=%p, nwords=%" PRIu32 "\n", lcd, wd, nwords);
 
@@ -290,10 +290,10 @@ static int esp32_ili93414ws_sendgram(FAR struct ili9341_lcd_s *lcd,
  *
  ****************************************************************************/
 
-static int esp32_ili93414ws_recvparam(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_recvparam(struct ili9341_lcd_s *lcd,
                                       uint8_t *param)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   SPI_SETBITS(priv->spi, 8);
 
@@ -320,10 +320,10 @@ static int esp32_ili93414ws_recvparam(FAR struct ili9341_lcd_s *lcd,
  *
  ****************************************************************************/
 
-static int esp32_ili93414ws_recvgram(FAR struct ili9341_lcd_s *lcd,
+static int esp32_ili93414ws_recvgram(struct ili9341_lcd_s *lcd,
                                      uint16_t *wd, uint32_t nwords)
 {
-  FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
+  struct ili93414ws_lcd_s *priv = (struct ili93414ws_lcd_s *)lcd;
 
   lcdinfo("wd=%p, nwords=%" PRIu32 "\n", wd, nwords);
 
@@ -349,8 +349,8 @@ static int esp32_ili93414ws_recvgram(FAR struct ili9341_lcd_s *lcd,
 
 int board_lcd_initialize(void)
 {
-  FAR struct ili93414ws_lcd_s *priv = &g_lcddev;
-  FAR struct spi_dev_s *spi;
+  struct ili93414ws_lcd_s *priv = &g_lcddev;
+  struct spi_dev_s *spi;
   lcdinfo("Initializing LCD\n");
 
   if (g_lcd == NULL)
@@ -423,7 +423,7 @@ int board_lcd_initialize(void)
  *
  ****************************************************************************/
 
-FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
+struct lcd_dev_s *board_lcd_getdev(int lcddev)
 {
   if (lcddev == 0)
     {
diff --git a/boards/xtensa/esp32/common/src/esp32_lcd_backpack.c b/boards/xtensa/esp32/common/src/esp32_lcd_backpack.c
index 137165ba04..88d802084b 100644
--- a/boards/xtensa/esp32/common/src/esp32_lcd_backpack.c
+++ b/boards/xtensa/esp32/common/src/esp32_lcd_backpack.c
@@ -59,9 +59,9 @@
 
 int board_lcd_backpack_init(int devno, int busno, int rows, int cols)
 {
-  FAR struct pcf8574_lcd_backpack_config_s cfg =
+  struct pcf8574_lcd_backpack_config_s cfg =
              LCD_I2C_BACKPACK_CFG_SAINSMART;
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   char devpath[12];
   int ret;
 
diff --git a/boards/xtensa/esp32/common/src/esp32_mcp2515.c b/boards/xtensa/esp32/common/src/esp32_mcp2515.c
index b8bba2ef06..ef4677301b 100644
--- a/boards/xtensa/esp32/common/src/esp32_mcp2515.c
+++ b/boards/xtensa/esp32/common/src/esp32_mcp2515.c
@@ -62,9 +62,9 @@ struct esp32_mcp2515config_s
 
   /* Additional private definitions only known to this driver */
 
-  FAR struct mcp2515_can_s *handle; /* The MCP2515 driver handle */
-  mcp2515_handler_t handler;        /* The MCP2515 interrupt handler */
-  FAR void *arg;                    /* Argument to pass to the interrupt handler */
+  struct mcp2515_can_s *handle; /* The MCP2515 driver handle */
+  mcp2515_handler_t handler;    /* The MCP2515 interrupt handler */
+  void *arg;                    /* Argument to pass to the interrupt handler */
 };
 
 /****************************************************************************
@@ -78,8 +78,8 @@ struct esp32_mcp2515config_s
  *   attach  - Attach the MCP2515 interrupt handler to the GPIO interrupt
  */
 
-static int  mcp2515_attach(FAR struct mcp2515_config_s *state,
-                           mcp2515_handler_t handler, FAR void *arg);
+static int  mcp2515_attach(struct mcp2515_config_s *state,
+                           mcp2515_handler_t handler, void *arg);
 
 /****************************************************************************
  * Private Data
@@ -118,10 +118,10 @@ static struct esp32_mcp2515config_s g_mcp2515config =
 
 /* This is the MCP2515 Interrupt handler */
 
-int mcp2515_interrupt(int irq, FAR void *context, FAR void *arg)
+int mcp2515_interrupt(int irq, void *context, void *arg)
 {
-  FAR struct esp32_mcp2515config_s *priv =
-             (FAR struct esp32_mcp2515config_s *)arg;
+  struct esp32_mcp2515config_s *priv =
+             (struct esp32_mcp2515config_s *)arg;
 
   DEBUGASSERT(priv != NULL);
 
@@ -137,11 +137,11 @@ int mcp2515_interrupt(int irq, FAR void *context, FAR void *arg)
   return OK;
 }
 
-static int mcp2515_attach(FAR struct mcp2515_config_s *state,
-                          mcp2515_handler_t handler, FAR void *arg)
+static int mcp2515_attach(struct mcp2515_config_s *state,
+                          mcp2515_handler_t handler, void *arg)
 {
-  FAR struct esp32_mcp2515config_s *priv =
-             (FAR struct esp32_mcp2515config_s *)state;
+  struct esp32_mcp2515config_s *priv =
+             (struct esp32_mcp2515config_s *)state;
   irqstate_t flags;
   int irq = ESP32_PIN2IRQ(GPIO_MCP2515_IRQ);
   int ret;
@@ -192,9 +192,9 @@ static int mcp2515_attach(FAR struct mcp2515_config_s *state,
 
 int board_mcp2515_initialize(int devno)
 {
-  FAR struct spi_dev_s     *spi;
-  FAR struct can_dev_s     *can;
-  FAR struct mcp2515_can_s *mcp2515;
+  struct spi_dev_s     *spi;
+  struct can_dev_s     *can;
+  struct mcp2515_can_s *mcp2515;
   char devpath[10];
   int ret;
 
diff --git a/boards/xtensa/esp32/common/src/esp32_oneshot.c b/boards/xtensa/esp32/common/src/esp32_oneshot.c
index c55e4ecfcb..fc0b6ccc2b 100644
--- a/boards/xtensa/esp32/common/src/esp32_oneshot.c
+++ b/boards/xtensa/esp32/common/src/esp32_oneshot.c
@@ -54,7 +54,7 @@
 int esp32_oneshot_init(int timer, uint16_t resolution)
 {
   int ret = OK;
-  FAR struct oneshot_lowerhalf_s *os_lower = NULL;
+  struct oneshot_lowerhalf_s *os_lower = NULL;
 
   os_lower = oneshot_initialize(timer, resolution);
   if (os_lower != NULL)
diff --git a/boards/xtensa/esp32/common/src/esp32_ssd1306.c b/boards/xtensa/esp32/common/src/esp32_ssd1306.c
index 7cb8b7feb9..7582421eb7 100644
--- a/boards/xtensa/esp32/common/src/esp32_ssd1306.c
+++ b/boards/xtensa/esp32/common/src/esp32_ssd1306.c
@@ -55,7 +55,7 @@
  * Private Data
  ****************************************************************************/
 
-static FAR struct lcd_dev_s    *g_lcddev;
+static struct lcd_dev_s    *g_lcddev;
 
 /* Configuration ************************************************************/
 
@@ -69,7 +69,7 @@ static FAR struct lcd_dev_s    *g_lcddev;
 
 int board_lcd_initialize(void)
 {
-  FAR struct i2c_master_s *i2c;
+  struct i2c_master_s *i2c;
   const int busno = OLED_I2C_PORT;
   const int devno = 0;
   int ret = OK;
@@ -130,7 +130,7 @@ int board_lcd_initialize(void)
  * Name:  board_lcd_getdev
  ****************************************************************************/
 
-FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
+struct lcd_dev_s *board_lcd_getdev(int lcddev)
 {
   if (lcddev == 0)
     {
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c
index 740c89c9fb..645c6f354e 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_boot.c
@@ -89,7 +89,7 @@ void board_late_initialize(void)
    * SMP bringup is complete.
    */
 
-  umm_addregion((FAR void *)HEAP_REGION_ROMAPP_START,
+  umm_addregion((void *)HEAP_REGION_ROMAPP_START,
                 (size_t)(HEAP_REGION_ROMAPP_END - HEAP_REGION_ROMAPP_START));
 #endif
 }
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c
index 0c3995edf0..0bfc102c25 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_buttons.c
@@ -127,7 +127,7 @@ uint32_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
+int board_button_irq(int id, xcpt_t irqhandler, void *arg)
 {
   int ret;
   DEBUGASSERT(id == BUTTON_BOOT);
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
index e1fd26c976..58b0d74dbe 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_gpio.c
@@ -87,19 +87,19 @@ struct esp32gpint_dev_s
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value);
+static int gpout_read(struct gpio_dev_s *dev, bool *value);
+static int gpout_write(struct gpio_dev_s *dev, bool value);
 #endif
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value);
+static int gpin_read(struct gpio_dev_s *dev, bool *value);
 #endif
 
 #if BOARD_NGPIOINT > 0
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_read(struct gpio_dev_s *dev, bool *value);
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback);
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable);
+static int gpint_enable(struct gpio_dev_s *dev, bool enable);
 #endif
 
 /****************************************************************************
@@ -172,9 +172,9 @@ static struct esp32gpint_dev_s g_gpint[BOARD_NGPIOINT];
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpout_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL && value != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOOUT);
@@ -188,9 +188,9 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  * Name: gpout_write
  ****************************************************************************/
 
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
+static int gpout_write(struct gpio_dev_s *dev, bool value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOOUT);
@@ -206,9 +206,9 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
  ****************************************************************************/
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpin_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL && value != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOIN);
@@ -226,8 +226,8 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
 #if BOARD_NGPIOINT > 0
 static int esp32gpio_interrupt(int irq, void *context, void *arg)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)arg;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)arg;
 
   DEBUGASSERT(esp32gpint != NULL && esp32gpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", esp32gpint->callback);
@@ -241,10 +241,10 @@ static int esp32gpio_interrupt(int irq, void *context, void *arg)
  * Name: gpint_read
  ****************************************************************************/
 
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpint_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
 
   DEBUGASSERT(esp32gpint != NULL && value != NULL);
   DEBUGASSERT(esp32gpint->esp32gpio.id < BOARD_NGPIOINT);
@@ -258,11 +258,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  * Name: gpint_attach
  ****************************************************************************/
 
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
   int irq = ESP32_PIN2IRQ(g_gpiointinputs[esp32gpint->esp32gpio.id]);
   int ret;
 
@@ -289,10 +289,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev,
  * Name: gpint_enable
  ****************************************************************************/
 
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
+static int gpint_enable(struct gpio_dev_s *dev, bool enable)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
   int irq = ESP32_PIN2IRQ(g_gpiointinputs[esp32gpint->esp32gpio.id]);
 
   if (enable)
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_boot.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_boot.c
index e173894e03..01a16ae8cf 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_boot.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_boot.c
@@ -89,7 +89,7 @@ void board_late_initialize(void)
    * SMP bringup is complete.
    */
 
-  umm_addregion((FAR void *)HEAP_REGION_ROMAPP_START,
+  umm_addregion((void *)HEAP_REGION_ROMAPP_START,
                 (size_t)(HEAP_REGION_ROMAPP_END - HEAP_REGION_ROMAPP_START));
 #endif
 }
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c
index 9b84eb76aa..274d35c2c1 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_buttons.c
@@ -127,7 +127,7 @@ uint32_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
+int board_button_irq(int id, xcpt_t irqhandler, void *arg)
 {
   int ret;
   DEBUGASSERT(id == BUTTON_BOOT);
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_boot.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_boot.c
index 25f7de63a2..6e1ef0700a 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_boot.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_boot.c
@@ -94,7 +94,7 @@ void board_late_initialize(void)
    * SMP bringup is complete.
    */
 
-  umm_addregion((FAR void *)HEAP_REGION_ROMAPP_START,
+  umm_addregion((void *)HEAP_REGION_ROMAPP_START,
                 (size_t)(HEAP_REGION_ROMAPP_END - HEAP_REGION_ROMAPP_START));
 #endif
 }
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c
index 0249bacb65..0f028f6cc3 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_buttons.c
@@ -127,7 +127,7 @@ uint32_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
+int board_button_irq(int id, xcpt_t irqhandler, void *arg)
 {
   int ret;
   DEBUGASSERT(id == BUTTON_BOOT);
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
index 5bbb7b4cf9..e7ed75cb70 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_gpio.c
@@ -87,19 +87,19 @@ struct esp32gpint_dev_s
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value);
+static int gpout_read(struct gpio_dev_s *dev, bool *value);
+static int gpout_write(struct gpio_dev_s *dev, bool value);
 #endif
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value);
+static int gpin_read(struct gpio_dev_s *dev, bool *value);
 #endif
 
 #if BOARD_NGPIOINT > 0
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_read(struct gpio_dev_s *dev, bool *value);
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback);
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable);
+static int gpint_enable(struct gpio_dev_s *dev, bool enable);
 #endif
 
 /****************************************************************************
@@ -172,9 +172,9 @@ static struct esp32gpint_dev_s g_gpint[BOARD_NGPIOINT];
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpout_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL && value != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOOUT);
@@ -188,9 +188,9 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  * Name: gpout_write
  ****************************************************************************/
 
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
+static int gpout_write(struct gpio_dev_s *dev, bool value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOOUT);
@@ -206,9 +206,9 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
  ****************************************************************************/
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpin_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL && value != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOIN);
@@ -226,8 +226,8 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
 #if BOARD_NGPIOINT > 0
 static int esp32gpio_interrupt(int irq, void *context, void *arg)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)arg;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)arg;
 
   DEBUGASSERT(esp32gpint != NULL && esp32gpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", esp32gpint->callback);
@@ -241,10 +241,10 @@ static int esp32gpio_interrupt(int irq, void *context, void *arg)
  * Name: gpint_read
  ****************************************************************************/
 
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpint_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
 
   DEBUGASSERT(esp32gpint != NULL && value != NULL);
   DEBUGASSERT(esp32gpint->esp32gpio.id < BOARD_NGPIOINT);
@@ -258,11 +258,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  * Name: gpint_attach
  ****************************************************************************/
 
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
   int irq = ESP32_PIN2IRQ(g_gpiointinputs[esp32gpint->esp32gpio.id]);
   int ret;
 
@@ -289,10 +289,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev,
  * Name: gpint_enable
  ****************************************************************************/
 
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
+static int gpint_enable(struct gpio_dev_s *dev, bool enable)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
   int irq = ESP32_PIN2IRQ(g_gpiointinputs[esp32gpint->esp32gpio.id]);
 
   if (enable)
diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_boot.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_boot.c
index 982411a925..afa316c8ab 100644
--- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_boot.c
+++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_boot.c
@@ -89,7 +89,7 @@ void board_late_initialize(void)
    * SMP bringup is complete.
    */
 
-  umm_addregion((FAR void *)HEAP_REGION_ROMAPP_START,
+  umm_addregion((void *)HEAP_REGION_ROMAPP_START,
                 (size_t)(HEAP_REGION_ROMAPP_END - HEAP_REGION_ROMAPP_START));
 #endif
 }
diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_buttons.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_buttons.c
index 3dc4a41d54..ae63ad80bf 100644
--- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_buttons.c
+++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_buttons.c
@@ -127,7 +127,7 @@ uint32_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
+int board_button_irq(int id, xcpt_t irqhandler, void *arg)
 {
   int ret;
   DEBUGASSERT(id == BUTTON_BOOT);
diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_gpio.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_gpio.c
index 572de73fed..4269a7f0a9 100644
--- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_gpio.c
+++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_gpio.c
@@ -87,19 +87,19 @@ struct esp32gpint_dev_s
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value);
+static int gpout_read(struct gpio_dev_s *dev, bool *value);
+static int gpout_write(struct gpio_dev_s *dev, bool value);
 #endif
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value);
+static int gpin_read(struct gpio_dev_s *dev, bool *value);
 #endif
 
 #if BOARD_NGPIOINT > 0
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_read(struct gpio_dev_s *dev, bool *value);
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback);
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable);
+static int gpint_enable(struct gpio_dev_s *dev, bool enable);
 #endif
 
 /****************************************************************************
@@ -172,9 +172,9 @@ static struct esp32gpint_dev_s g_gpint[BOARD_NGPIOINT];
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpout_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL && value != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOOUT);
@@ -188,9 +188,9 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  * Name: gpout_write
  ****************************************************************************/
 
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
+static int gpout_write(struct gpio_dev_s *dev, bool value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOOUT);
@@ -206,9 +206,9 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
  ****************************************************************************/
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpin_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpio_dev_s *esp32gpio = (FAR struct esp32gpio_dev_s *)dev;
+  struct esp32gpio_dev_s *esp32gpio = (struct esp32gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32gpio != NULL && value != NULL);
   DEBUGASSERT(esp32gpio->id < BOARD_NGPIOIN);
@@ -226,8 +226,8 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
 #if BOARD_NGPIOINT > 0
 static int esp32gpio_interrupt(int irq, void *context, void *arg)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)arg;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)arg;
 
   DEBUGASSERT(esp32gpint != NULL && esp32gpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", esp32gpint->callback);
@@ -241,10 +241,10 @@ static int esp32gpio_interrupt(int irq, void *context, void *arg)
  * Name: gpint_read
  ****************************************************************************/
 
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpint_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
 
   DEBUGASSERT(esp32gpint != NULL && value != NULL);
   DEBUGASSERT(esp32gpint->esp32gpio.id < BOARD_NGPIOINT);
@@ -258,11 +258,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  * Name: gpint_attach
  ****************************************************************************/
 
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
   int irq = ESP32_PIN2IRQ(g_gpiointinputs[esp32gpint->esp32gpio.id]);
   int ret;
 
@@ -289,10 +289,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev,
  * Name: gpint_enable
  ****************************************************************************/
 
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
+static int gpint_enable(struct gpio_dev_s *dev, bool enable)
 {
-  FAR struct esp32gpint_dev_s *esp32gpint =
-    (FAR struct esp32gpint_dev_s *)dev;
+  struct esp32gpint_dev_s *esp32gpint =
+    (struct esp32gpint_dev_s *)dev;
   int irq = ESP32_PIN2IRQ(g_gpiointinputs[esp32gpint->esp32gpio.id]);
 
   if (enable)
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_gpio.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_gpio.c
index 69423f5ed2..10e18f703f 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_gpio.c
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_gpio.c
@@ -83,19 +83,19 @@ struct esp32s2gpint_dev_s
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value);
+static int gpout_read(struct gpio_dev_s *dev, bool *value);
+static int gpout_write(struct gpio_dev_s *dev, bool value);
 #endif
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value);
+static int gpin_read(struct gpio_dev_s *dev, bool *value);
 #endif
 
 #if BOARD_NGPIOINT > 0
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value);
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_read(struct gpio_dev_s *dev, bool *value);
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback);
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable);
+static int gpint_enable(struct gpio_dev_s *dev, bool enable);
 #endif
 
 /****************************************************************************
@@ -179,10 +179,10 @@ static struct esp32s2gpint_dev_s g_gpint[BOARD_NGPIOINT];
  ****************************************************************************/
 
 #if BOARD_NGPIOOUT > 0
-static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpout_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32s2gpio_dev_s *esp32s2gpio =
-    (FAR struct esp32s2gpio_dev_s *)dev;
+  struct esp32s2gpio_dev_s *esp32s2gpio =
+    (struct esp32s2gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32s2gpio != NULL && value != NULL);
   DEBUGASSERT(esp32s2gpio->id < BOARD_NGPIOOUT);
@@ -207,10 +207,10 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  *
  ****************************************************************************/
 
-static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
+static int gpout_write(struct gpio_dev_s *dev, bool value)
 {
-  FAR struct esp32s2gpio_dev_s *esp32s2gpio =
-    (FAR struct esp32s2gpio_dev_s *)dev;
+  struct esp32s2gpio_dev_s *esp32s2gpio =
+    (struct esp32s2gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32s2gpio != NULL);
   DEBUGASSERT(esp32s2gpio->id < BOARD_NGPIOOUT);
@@ -237,10 +237,10 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
  ****************************************************************************/
 
 #if BOARD_NGPIOIN > 0
-static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpin_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32s2gpio_dev_s *esp32s2gpio =
-    (FAR struct esp32s2gpio_dev_s *)dev;
+  struct esp32s2gpio_dev_s *esp32s2gpio =
+    (struct esp32s2gpio_dev_s *)dev;
 
   DEBUGASSERT(esp32s2gpio != NULL && value != NULL);
   DEBUGASSERT(esp32s2gpio->id < BOARD_NGPIOIN);
@@ -262,8 +262,8 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value)
 #if BOARD_NGPIOINT > 0
 static int esp32s2gpio_interrupt(int irq, void *context, void *arg)
 {
-  FAR struct esp32s2gpint_dev_s *esp32s2gpint =
-    (FAR struct esp32s2gpint_dev_s *)arg;
+  struct esp32s2gpint_dev_s *esp32s2gpint =
+    (struct esp32s2gpint_dev_s *)arg;
 
   DEBUGASSERT(esp32s2gpint != NULL && esp32s2gpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", esp32s2gpint->callback);
@@ -288,10 +288,10 @@ static int esp32s2gpio_interrupt(int irq, void *context, void *arg)
  *
  ****************************************************************************/
 
-static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
+static int gpint_read(struct gpio_dev_s *dev, bool *value)
 {
-  FAR struct esp32s2gpint_dev_s *esp32s2gpint =
-    (FAR struct esp32s2gpint_dev_s *)dev;
+  struct esp32s2gpint_dev_s *esp32s2gpint =
+    (struct esp32s2gpint_dev_s *)dev;
 
   DEBUGASSERT(esp32s2gpint != NULL && value != NULL);
   DEBUGASSERT(esp32s2gpint->esp32s2gpio.id < BOARD_NGPIOINT);
@@ -318,11 +318,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value)
  *
  ****************************************************************************/
 
-static int gpint_attach(FAR struct gpio_dev_s *dev,
+static int gpint_attach(struct gpio_dev_s *dev,
                         pin_interrupt_t callback)
 {
-  FAR struct esp32s2gpint_dev_s *esp32s2gpint =
-    (FAR struct esp32s2gpint_dev_s *)dev;
+  struct esp32s2gpint_dev_s *esp32s2gpint =
+    (struct esp32s2gpint_dev_s *)dev;
   int irq = ESP32S2_PIN2IRQ(g_gpiointinputs[esp32s2gpint->esp32s2gpio.id]);
   int ret;
 
@@ -360,10 +360,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev,
  *
  ****************************************************************************/
 
-static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
+static int gpint_enable(struct gpio_dev_s *dev, bool enable)
 {
-  FAR struct esp32s2gpint_dev_s *esp32s2gpint =
-    (FAR struct esp32s2gpint_dev_s *)dev;
+  struct esp32s2gpint_dev_s *esp32s2gpint =
+    (struct esp32s2gpint_dev_s *)dev;
   int irq = ESP32S2_PIN2IRQ(g_gpiointinputs[esp32s2gpint->esp32s2gpio.id]);
 
   if (enable)
diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_board_spiflash.c b/boards/xtensa/esp32s3/common/src/esp32s3_board_spiflash.c
index f74748ea8b..75e266b957 100644
--- a/boards/xtensa/esp32s3/common/src/esp32s3_board_spiflash.c
+++ b/boards/xtensa/esp32s3/common/src/esp32s3_board_spiflash.c
@@ -69,7 +69,7 @@
  ****************************************************************************/
 
 #if defined (CONFIG_ESP32S3_SPIFLASH_SMARTFS)
-static int setup_smartfs(int smartn, FAR struct mtd_dev_s *mtd,
+static int setup_smartfs(int smartn, struct mtd_dev_s *mtd,
                          const char *mnt_pt)
 {
   int ret = OK;
@@ -130,7 +130,7 @@ static int setup_smartfs(int smartn, FAR struct mtd_dev_s *mtd,
  ****************************************************************************/
 
 #if defined (CONFIG_ESP32S3_SPIFLASH_LITTLEFS)
-static int setup_littlefs(const char *path, FAR struct mtd_dev_s *mtd,
+static int setup_littlefs(const char *path, struct mtd_dev_s *mtd,
                           const char *mnt_pt, int priv)
 {
   int ret = OK;
@@ -178,7 +178,7 @@ static int setup_littlefs(const char *path, FAR struct mtd_dev_s *mtd,
  ****************************************************************************/
 
 #if defined (CONFIG_ESP32S3_SPIFLASH_SPIFFS)
-static int setup_spiffs(const char *path, FAR struct mtd_dev_s *mtd,
+static int setup_spiffs(const char *path, struct mtd_dev_s *mtd,
                         const char *mnt_pt, int priv)
 {
   int ret = OK;
@@ -220,7 +220,7 @@ static int setup_spiffs(const char *path, FAR struct mtd_dev_s *mtd,
  ****************************************************************************/
 
 #if defined (CONFIG_ESP32S3_SPIFLASH_NXFFS)
-static int setup_nxffs(FAR struct mtd_dev_s *mtd, const char *mnt_pt)
+static int setup_nxffs(struct mtd_dev_s *mtd, const char *mnt_pt)
 {
   int ret = OK;
 
@@ -259,7 +259,7 @@ static int setup_nxffs(FAR struct mtd_dev_s *mtd, const char *mnt_pt)
 static int init_storage_partition(void)
 {
   int ret = OK;
-  FAR struct mtd_dev_s *mtd;
+  struct mtd_dev_s *mtd;
 
   mtd = esp32s3_spiflash_alloc_mtdpart(CONFIG_ESP32S3_STORAGE_MTD_OFFSET,
                                        CONFIG_ESP32S3_STORAGE_MTD_SIZE,
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_buttons.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_buttons.c
index b8be81c95a..9dabe6097c 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_buttons.c
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_buttons.c
@@ -125,7 +125,7 @@ uint32_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
+int board_button_irq(int id, xcpt_t irqhandler, void *arg)
 {
   int ret;
   DEBUGASSERT(id == BUTTON_BOOT);