diff --git a/arch/risc-v/src/bl602/bl602_hbn.h b/arch/risc-v/src/bl602/bl602_hbn.h
index 9709ac6203..267267476e 100644
--- a/arch/risc-v/src/bl602/bl602_hbn.h
+++ b/arch/risc-v/src/bl602/bl602_hbn.h
@@ -64,7 +64,7 @@ extern "C"
 #define BL602_HBN_INT_ACOMP0     (20)    /* HBN interrupt type: ACOMP0 */
 #define BL602_HBN_INT_ACOMP1     (22)    /* HBN interrupt type: ACOMP1 */
 
-typedef CODE int (*bl602_hbn_cb_t)(void *arg);
+typedef int (*bl602_hbn_cb_t)(void *arg);
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc.h b/arch/risc-v/src/esp32c3/esp32c3_rtc.h
index 8b2ef2eab5..6b02cb3f4f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_rtc.h
@@ -152,7 +152,7 @@ struct esp32c3_cpu_freq_config_s
 
 /* The form of an alarm callback */
 
-typedef CODE void (*alm_callback_t)(void *arg, unsigned int alarmid);
+typedef void (*alm_callback_t)(void *arg, unsigned int alarmid);
 
 enum alm_id_e
 {
diff --git a/arch/risc-v/src/esp32c3/esp32c3_tim.h b/arch/risc-v/src/esp32c3/esp32c3_tim.h
index 92968e7ae8..3d5cda5393 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tim.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_tim.h
@@ -99,36 +99,36 @@ struct esp32c3_tim_ops_s
 {
   /* Timer tasks */
 
-  CODE void (*start)(struct esp32c3_tim_dev_s *dev);
-  CODE void (*stop)(struct esp32c3_tim_dev_s *dev);
-  CODE void (*clear)(struct esp32c3_tim_dev_s *dev);
+  void (*start)(struct esp32c3_tim_dev_s *dev);
+  void (*stop)(struct esp32c3_tim_dev_s *dev);
+  void (*clear)(struct esp32c3_tim_dev_s *dev);
 
   /* Timer operations */
 
-  CODE void (*setmode)(struct esp32c3_tim_dev_s *dev,
+  void (*setmode)(struct esp32c3_tim_dev_s *dev,
                        enum esp32c3_tim_mode_e mode);
-  CODE void (*setclksrc)(struct esp32c3_tim_dev_s *dev,
+  void (*setclksrc)(struct esp32c3_tim_dev_s *dev,
                          enum esp32c3_tim_clksrc_e src);
-  CODE void (*setpre)(struct esp32c3_tim_dev_s *dev, uint16_t pre);
-  CODE void (*getcounter)(struct esp32c3_tim_dev_s *dev,
+  void (*setpre)(struct esp32c3_tim_dev_s *dev, uint16_t pre);
+  void (*getcounter)(struct esp32c3_tim_dev_s *dev,
                           uint64_t *value);
-  CODE void (*setcounter)(struct esp32c3_tim_dev_s *dev, uint64_t value);
-  CODE void (*reloadnow)(struct esp32c3_tim_dev_s *dev);
-  CODE void (*getalarmvalue)(struct esp32c3_tim_dev_s *dev,
+  void (*setcounter)(struct esp32c3_tim_dev_s *dev, uint64_t value);
+  void (*reloadnow)(struct esp32c3_tim_dev_s *dev);
+  void (*getalarmvalue)(struct esp32c3_tim_dev_s *dev,
                              uint64_t *value);
-  CODE void (*setalarmvalue)(struct esp32c3_tim_dev_s *dev,
+  void (*setalarmvalue)(struct esp32c3_tim_dev_s *dev,
                              uint64_t value);
-  CODE void (*setalarm)(struct esp32c3_tim_dev_s *dev, bool enable);
-  CODE void (*setautoreload)(struct esp32c3_tim_dev_s *dev, bool enable);
+  void (*setalarm)(struct esp32c3_tim_dev_s *dev, bool enable);
+  void (*setautoreload)(struct esp32c3_tim_dev_s *dev, bool enable);
 
   /* Timer interrupts */
 
-  CODE int (*setisr)(struct esp32c3_tim_dev_s *dev, xcpt_t handler,
+  int (*setisr)(struct esp32c3_tim_dev_s *dev, xcpt_t handler,
                      void * arg);
-  CODE void (*enableint)(struct esp32c3_tim_dev_s *dev);
-  CODE void (*disableint)(struct esp32c3_tim_dev_s *dev);
-  CODE void (*ackint)(struct esp32c3_tim_dev_s *dev);
-  CODE int  (*checkint)(struct esp32c3_tim_dev_s *dev);
+  void (*enableint)(struct esp32c3_tim_dev_s *dev);
+  void (*disableint)(struct esp32c3_tim_dev_s *dev);
+  void (*ackint)(struct esp32c3_tim_dev_s *dev);
+  int  (*checkint)(struct esp32c3_tim_dev_s *dev);
 };
 
 /****************************************************************************