From f40b09cbc92d1637d98885dbaf5e796b7bb08e87 Mon Sep 17 00:00:00 2001
From: Petro Karashchenko <petro.karashchenko@gmail.com>
Date: Sat, 24 Aug 2024 13:20:49 -0400
Subject: [PATCH] style: remove redundant spaces

Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
---
 arch/arm/src/am335x/am335x_i2c.c                 |  4 ++--
 arch/arm/src/at32/at32_i2c.c                     |  4 ++--
 arch/arm/src/gd32f4/gd32f4xx_i2c.c               |  4 ++--
 arch/arm/src/imxrt/imxrt_lpi2c.c                 |  4 ++--
 arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c   | 16 +++++++---------
 arch/arm/src/rtl8720c/amebaz_coex.c              |  2 +-
 arch/arm/src/s32k1xx/s32k1xx_lpi2c.c             |  4 ++--
 arch/arm/src/s32k3xx/s32k3xx_lpi2c.c             |  4 ++--
 arch/arm/src/stm32/stm32_i2c.c                   |  4 ++--
 arch/arm/src/stm32/stm32_i2c_alt.c               |  4 ++--
 arch/arm/src/stm32/stm32_i2c_v2.c                |  4 ++--
 arch/arm/src/stm32/stm32f40xxx_i2c.c             |  4 ++--
 arch/arm/src/stm32f0l0g0/stm32_i2c.c             |  4 ++--
 arch/arm/src/stm32f7/stm32_i2c.c                 |  4 ++--
 arch/arm/src/stm32h7/stm32_i2c.c                 |  4 ++--
 arch/arm/src/stm32l4/stm32l4_i2c.c               |  4 ++--
 arch/arm/src/stm32u5/stm32_i2c.c                 |  4 ++--
 arch/arm/src/stm32wb/stm32wb_i2c.c               |  4 ++--
 arch/arm/src/tiva/common/tiva_adclow.c           |  2 +-
 arch/arm64/src/imx9/imx9_lpi2c.c                 |  4 ++--
 arch/mips/src/pic32mz/pic32mz_i2c.c              |  4 ++--
 arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c     |  2 +-
 arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c  |  4 ++--
 arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c     |  6 +++---
 .../src/esp32c3-legacy/esp32c3_wifi_adapter.c    |  2 +-
 arch/risc-v/src/rv32m1/rv32m1_gpio.c             |  8 ++++----
 arch/xtensa/src/esp32/esp32_emac.c               |  2 +-
 arch/xtensa/src/esp32/esp32_himem.c              |  2 +-
 arch/xtensa/src/esp32/esp32_i2c.c                |  6 +++---
 arch/xtensa/src/esp32/esp32_wlan.c               |  2 +-
 arch/xtensa/src/esp32s2/esp32s2_i2c.c            |  4 ++--
 arch/xtensa/src/esp32s3/esp32s3_himem.c          |  2 +-
 arch/xtensa/src/esp32s3/esp32s3_i2c.c            |  4 ++--
 arch/xtensa/src/esp32s3/esp32s3_spiram.c         |  2 +-
 arch/xtensa/src/esp32s3/esp32s3_wlan.c           |  2 +-
 35 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/arch/arm/src/am335x/am335x_i2c.c b/arch/arm/src/am335x/am335x_i2c.c
index 5fe0e4e35b..841b74044e 100644
--- a/arch/arm/src/am335x/am335x_i2c.c
+++ b/arch/arm/src/am335x/am335x_i2c.c
@@ -749,8 +749,8 @@ static void am335x_i2c_traceevent(struct am335x_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/at32/at32_i2c.c b/arch/arm/src/at32/at32_i2c.c
index d35edcf80c..dd068cfcb9 100644
--- a/arch/arm/src/at32/at32_i2c.c
+++ b/arch/arm/src/at32/at32_i2c.c
@@ -992,8 +992,8 @@ static void at32_i2c_traceevent(struct at32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/gd32f4/gd32f4xx_i2c.c b/arch/arm/src/gd32f4/gd32f4xx_i2c.c
index fbe8709fb7..123a2d63f3 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_i2c.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_i2c.c
@@ -943,8 +943,8 @@ static void gd32_i2c_traceevent(struct gd32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c
index e46bf1eda9..3627ff0647 100644
--- a/arch/arm/src/imxrt/imxrt_lpi2c.c
+++ b/arch/arm/src/imxrt/imxrt_lpi2c.c
@@ -1023,8 +1023,8 @@ static void imxrt_lpi2c_traceevent(struct imxrt_lpi2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c b/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c
index c6a0ec7221..0fd41cd125 100644
--- a/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c
+++ b/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c
@@ -83,7 +83,7 @@ struct phyplus_lowerhalf_s
  * Private Function Prototypes
  ****************************************************************************/
 
-static int phyplus_timer_handler(int irq, void * context, void * arg);
+static int phyplus_timer_handler(int irq, void *context, void *arg);
 
 /* "Lower half" driver methods **********************************************/
 
@@ -97,7 +97,7 @@ static void phyplus_setcallback(struct timer_lowerhalf_s *lower,
                                 tccb_t callback, void *arg);
 
 /* static int phyplus_ioctl(struct timer_lowerhalf_s *lower, int cmd,
- *                           unsigned long arg);
+ *                          unsigned long arg);
  */
 
 /****************************************************************************
@@ -194,9 +194,9 @@ static struct phyplus_lowerhalf_s g_tim6_lowerhalf =
  *
  ****************************************************************************/
 
-static int phyplus_timer_handler(int irq, void * context, void * arg)
+static int phyplus_timer_handler(int irq, void *context, void *arg)
 {
-  struct phyplus_lowerhalf_s *lower = (struct phyplus_lowerhalf_s *) arg;
+  struct phyplus_lowerhalf_s *lower = (struct phyplus_lowerhalf_s *)arg;
 
   /* PHYPLUS_TIM_ACKINT(lower->tim); */
 
@@ -311,7 +311,7 @@ static int phyplus_stop(struct timer_lowerhalf_s *lower)
  ****************************************************************************/
 
 static int phyplus_settimeout(struct timer_lowerhalf_s *lower,
-                            uint32_t timeout)
+                              uint32_t timeout)
 {
   struct phyplus_lowerhalf_s *priv =
       (struct phyplus_lowerhalf_s *)lower;
@@ -593,8 +593,7 @@ static int phyplus_getstatus(struct timer_lowerhalf_s *lower,
   return OK;
 }
 
-int phyplus_timer_register(struct phyplus_timer_param_s
-                           *phyplus_timer_param)
+int phyplus_timer_register(struct phyplus_timer_param_s *phyplus_timer_param)
 {
   char devname[16];
 
@@ -609,8 +608,7 @@ int phyplus_timer_register(struct phyplus_timer_param_s
   return phyplus_timer_initialize(devname, phyplus_timer_param->timer_idx);
 }
 
-int phyplus_timer_ungister(struct phyplus_timer_param_s
-                           *phyplus_timer_param)
+int phyplus_timer_ungister(struct phyplus_timer_param_s *phyplus_timer_param)
 {
   return 0;
 }
diff --git a/arch/arm/src/rtl8720c/amebaz_coex.c b/arch/arm/src/rtl8720c/amebaz_coex.c
index 8ad103db7a..2401c4e68b 100644
--- a/arch/arm/src/rtl8720c/amebaz_coex.c
+++ b/arch/arm/src/rtl8720c/amebaz_coex.c
@@ -98,7 +98,7 @@ void bt_coex_handle_cmd_complete_evt(uint16_t opcode, uint16_t cause,
       if (total_len <= 1)
         {
           printf("bt_coex_handle_cmd_complete_evt: not report to wifi");
-          return ;
+          return;
         }
 
       rltk_coex_mailbox_to_wifi(p, total_len);
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
index 48f5079b17..e75d2ffff0 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
@@ -872,8 +872,8 @@ static void s32k1xx_lpi2c_traceevent(struct s32k1xx_lpi2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c b/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c
index 867c06397f..8250ab4683 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c
@@ -879,8 +879,8 @@ static void s32k3xx_lpi2c_traceevent(struct s32k3xx_lpi2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 0e97f090f2..f4a41c0edb 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -794,8 +794,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index 33cc643c98..afca42617b 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -824,8 +824,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32/stm32_i2c_v2.c b/arch/arm/src/stm32/stm32_i2c_v2.c
index e17b537849..c9c531228c 100644
--- a/arch/arm/src/stm32/stm32_i2c_v2.c
+++ b/arch/arm/src/stm32/stm32_i2c_v2.c
@@ -1116,8 +1116,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32/stm32f40xxx_i2c.c b/arch/arm/src/stm32/stm32f40xxx_i2c.c
index ced6566a35..f23b113488 100644
--- a/arch/arm/src/stm32/stm32f40xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f40xxx_i2c.c
@@ -847,8 +847,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32f0l0g0/stm32_i2c.c b/arch/arm/src/stm32f0l0g0/stm32_i2c.c
index 4f34ed1c99..6f82f2b1c7 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_i2c.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_i2c.c
@@ -1115,8 +1115,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 4972407c18..c4ef5cfb27 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -1151,8 +1151,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32h7/stm32_i2c.c b/arch/arm/src/stm32h7/stm32_i2c.c
index c484db8742..52cf760f48 100644
--- a/arch/arm/src/stm32h7/stm32_i2c.c
+++ b/arch/arm/src/stm32h7/stm32_i2c.c
@@ -1112,8 +1112,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index 7a2ed68dc0..7ed781c1ca 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -1165,8 +1165,8 @@ static void stm32l4_i2c_traceevent(struct stm32l4_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32u5/stm32_i2c.c b/arch/arm/src/stm32u5/stm32_i2c.c
index 3ef32968cc..c47cbf6a68 100644
--- a/arch/arm/src/stm32u5/stm32_i2c.c
+++ b/arch/arm/src/stm32u5/stm32_i2c.c
@@ -1165,8 +1165,8 @@ static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/stm32wb/stm32wb_i2c.c b/arch/arm/src/stm32wb/stm32wb_i2c.c
index 196db4234e..bda98847bb 100644
--- a/arch/arm/src/stm32wb/stm32wb_i2c.c
+++ b/arch/arm/src/stm32wb/stm32wb_i2c.c
@@ -988,8 +988,8 @@ static void stm32wb_i2c_traceevent(struct stm32wb_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/arm/src/tiva/common/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c
index b51b6b3692..a72f35a26e 100644
--- a/arch/arm/src/tiva/common/tiva_adclow.c
+++ b/arch/arm/src/tiva/common/tiva_adclow.c
@@ -711,7 +711,7 @@ static void tiva_adc_read(void *arg)
   ret = tiva_adc_lock(g_adcs[sse->adc], sse->num);
   if (ret < 0)
     {
-      return ;
+      return;
     }
 
   /* Get sampled data */
diff --git a/arch/arm64/src/imx9/imx9_lpi2c.c b/arch/arm64/src/imx9/imx9_lpi2c.c
index c1122b1ddc..da47e93d8e 100644
--- a/arch/arm64/src/imx9/imx9_lpi2c.c
+++ b/arch/arm64/src/imx9/imx9_lpi2c.c
@@ -1192,8 +1192,8 @@ static void imx9_lpi2c_traceevent(struct imx9_lpi2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/mips/src/pic32mz/pic32mz_i2c.c b/arch/mips/src/pic32mz/pic32mz_i2c.c
index 726ba00ec6..d35b4facd5 100644
--- a/arch/mips/src/pic32mz/pic32mz_i2c.c
+++ b/arch/mips/src/pic32mz/pic32mz_i2c.c
@@ -553,8 +553,8 @@ static void pic32mz_i2c_traceevent(struct pic32mz_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
index 50f262f50d..a3f4af707d 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_adc.c
@@ -570,7 +570,7 @@ static void adc_read_work(struct adc_dev_s *dev)
   if (ret < 0)
     {
       aerr("Failed to lock ret=%d\n", ret);
-      return ;
+      return;
     }
 
   adc_samplecfg(priv->channel);
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
index 8477e182c9..8c8189478c 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
@@ -1032,7 +1032,7 @@ static void mpi_bigendian_to_host(uint32_t * const p, size_t limbs)
   uint32_t *cur_limb_right;
   if (limbs == 0)
     {
-      return ;
+      return;
     }
 
   /* Traverse limbs and
@@ -1255,7 +1255,7 @@ void esp32c3_mpi_free(struct esp32c3_mpi_s *X)
 {
   if (X == NULL)
     {
-      return ;
+      return;
     }
 
   if (X->p != NULL)
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
index 559fd43a0d..eaf0e0e885 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c
@@ -621,7 +621,7 @@ static void esp32c3_i2c_init_clock(struct esp32c3_i2c_priv_s *priv,
 {
   if (bus_freq == priv->clk_freq)
     {
-      return ;
+      return;
     }
 
   uint32_t reg_value = 0;
@@ -1245,8 +1245,8 @@ static void esp32c3_i2c_traceevent(struct esp32c3_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
index 6978ba7f77..78193acdad 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c
@@ -932,7 +932,7 @@ static void esp_set_isr(int32_t n, void *f, void *arg)
 
   if (g_wifi_irq_bind)
     {
-      return ;
+      return;
     }
 
   adapter = kmm_malloc(sizeof(struct irq_adpt));
diff --git a/arch/risc-v/src/rv32m1/rv32m1_gpio.c b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
index bdfa832325..f677fb7112 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_gpio.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
@@ -483,7 +483,7 @@ void rv32m1_gpio_write(uint32_t cfgset, bool value)
   port = (cfgset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
   if (port >= RV32M1_NGPIO_PORTS)
     {
-      return ;
+      return;
     }
 
   /* Get the gpio base address */
@@ -517,7 +517,7 @@ void rv32m1_gpio_toggle(uint32_t cfgset)
   port = (cfgset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
   if (port >= RV32M1_NGPIO_PORTS)
     {
-      return ;
+      return;
     }
 
   /* Get the gpio base address */
@@ -568,7 +568,7 @@ void rv32m1_gpio_irqenable(uint32_t cfgset)
   port = (cfgset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
   if (port >= RV32M1_NGPIO_PORTS)
     {
-      return ;
+      return;
     }
 
   /* Get the irq */
@@ -597,7 +597,7 @@ void rv32m1_gpio_irqdisable(uint32_t cfgset)
   port = (cfgset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
   if (port >= RV32M1_NGPIO_PORTS)
     {
-      return ;
+      return;
     }
 
   /* Get the port base address */
diff --git a/arch/xtensa/src/esp32/esp32_emac.c b/arch/xtensa/src/esp32/esp32_emac.c
index 292d5068d6..c80ded7714 100644
--- a/arch/xtensa/src/esp32/esp32_emac.c
+++ b/arch/xtensa/src/esp32/esp32_emac.c
@@ -1640,7 +1640,7 @@ static void emac_dopoll(struct esp32_emac_s *priv)
         {
           /* never reach */
 
-          return ;
+          return;
         }
 
       dev->d_len = EMAC_BUF_LEN;
diff --git a/arch/xtensa/src/esp32/esp32_himem.c b/arch/xtensa/src/esp32/esp32_himem.c
index 8dd1c0adb0..1b2347f879 100644
--- a/arch/xtensa/src/esp32/esp32_himem.c
+++ b/arch/xtensa/src/esp32/esp32_himem.c
@@ -212,7 +212,7 @@ int esp_himem_init(void)
 
   /* Catch double init */
 
-  /* Looks weird; last arg is empty so it expands to 'return ;' */
+  /* Looks weird; last arg is empty so it expands to 'return;' */
 
   HIMEM_CHECK(g_ram_descriptor != NULL, "already initialized", 0);
 
diff --git a/arch/xtensa/src/esp32/esp32_i2c.c b/arch/xtensa/src/esp32/esp32_i2c.c
index 0a8313f9d1..2b78cb4434 100644
--- a/arch/xtensa/src/esp32/esp32_i2c.c
+++ b/arch/xtensa/src/esp32/esp32_i2c.c
@@ -620,7 +620,7 @@ static void esp32_i2c_init_clock(struct esp32_i2c_priv_s *priv,
 
   if (clk_freq == priv->clk_freq)
     {
-      return ;
+      return;
     }
 
   esp32_i2c_set_reg(priv, I2C_SCL_LOW_PERIOD_OFFSET, half_cycles);
@@ -1248,8 +1248,8 @@ static void esp32_i2c_traceevent(struct esp32_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/xtensa/src/esp32/esp32_wlan.c b/arch/xtensa/src/esp32/esp32_wlan.c
index c242db1906..aa860b1d5e 100644
--- a/arch/xtensa/src/esp32/esp32_wlan.c
+++ b/arch/xtensa/src/esp32/esp32_wlan.c
@@ -979,7 +979,7 @@ static void wlan_dopoll(struct wlan_priv_s *priv)
   pktbuf = wlan_alloc_buffer(priv);
   if (!pktbuf)
     {
-      return ;
+      return;
     }
 
   dev->d_buf = pktbuf->buffer;
diff --git a/arch/xtensa/src/esp32s2/esp32s2_i2c.c b/arch/xtensa/src/esp32s2/esp32s2_i2c.c
index 6e89ecd2d3..6a0d290449 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_i2c.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_i2c.c
@@ -1268,8 +1268,8 @@ static void i2c_traceevent(struct esp32s2_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/xtensa/src/esp32s3/esp32s3_himem.c b/arch/xtensa/src/esp32s3/esp32s3_himem.c
index dbaf9751f8..dbc246dad3 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_himem.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_himem.c
@@ -1032,7 +1032,7 @@ int esp_himem_init(void)
 
   /* Catch double init */
 
-  /* Looks weird; last arg is empty so it expands to 'return ;' */
+  /* Looks weird; last arg is empty so it expands to 'return;' */
 
   HIMEM_CHECK(g_ram_descriptor != NULL, "already initialized", 0);
 
diff --git a/arch/xtensa/src/esp32s3/esp32s3_i2c.c b/arch/xtensa/src/esp32s3/esp32s3_i2c.c
index a689a056a6..13675307fe 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_i2c.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_i2c.c
@@ -1297,8 +1297,8 @@ static void i2c_traceevent(struct esp32s3_i2c_priv_s *priv,
 
       /* Initialize the new trace entry */
 
-      trace->event  = event;
-      trace->parm   = parm;
+      trace->event = event;
+      trace->parm  = parm;
 
       /* Bump up the trace index (unless we are out of trace entries) */
 
diff --git a/arch/xtensa/src/esp32s3/esp32s3_spiram.c b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
index c4722167f8..7e583cc29e 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_spiram.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
@@ -608,7 +608,7 @@ int IRAM_ATTR esp_spiram_init(void)
       merr("Expected %dMB chip but found %dMB chip. Bailing out..",
            (CONFIG_ESP32S3_SPIRAM_SIZE / 1024 / 1024),
            (psram_physical_size / 1024 / 1024));
-      return ;
+      return;
     }
 #endif
 
diff --git a/arch/xtensa/src/esp32s3/esp32s3_wlan.c b/arch/xtensa/src/esp32s3/esp32s3_wlan.c
index 1c9a30a1a0..638d802a9a 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_wlan.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_wlan.c
@@ -896,7 +896,7 @@ static void wlan_dopoll(struct wlan_priv_s *priv)
   pktbuf = wlan_alloc_buffer(priv);
   if (!pktbuf)
     {
-      return ;
+      return;
     }
 
   dev->d_buf = pktbuf->buffer;