arm: Update UNUSED()

pbarada · pbarada · commit a46334e2992b · 2026-02-25T14:55:10.000-05:00
Change arm definition of UNUSED() for gcc/clang builds to cast arg to void.
Enable -Wunused-parameter warning for ARM non-GHS toolchains.
Fix unused parameter warnings where argc is unused.  In cases where
corresponding argv[] is used, first return ERROR if argc is less than
last element accessed in argv[].

Signed-off-by: Peter Barada &lt;peter.barada@gmail.com&gt;
diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
@@ -405,7 +405,7 @@ else
   ARCHOPTIMIZATION += -Wall
 endif
 
-ARCHOPTIMIZATION += -Wshadow -Wundef
+ARCHOPTIMIZATION += -Wshadow -Wundef -Wunused-parameter
 
 ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)
   ARCHOPTIMIZATION += -nostdlib
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_usb.c b/boards/arm/stm32h7/linum-stm32h753bi/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/nucleo-h745zi/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h745zi/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/openh743i/src/stm32_usb.c b/boards/arm/stm32h7/openh743i/src/stm32_usb.c
@@ -78,6 +78,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/stm32h745i-disco/src/stm32_usb.c b/boards/arm/stm32h7/stm32h745i-disco/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/stm32h750b-dk/src/stm32_usb.c b/boards/arm/stm32h7/stm32h750b-dk/src/stm32_usb.c
@@ -89,6 +89,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/weact-stm32h743/src/stm32_usb.c b/boards/arm/stm32h7/weact-stm32h743/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUNSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/boards/arm/stm32h7/weact-stm32h750/src/stm32_usb.c b/boards/arm/stm32h7/weact-stm32h750/src/stm32_usb.c
@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running\n");
   for (; ; )
     {
diff --git a/drivers/net/netdev_upperhalf.c b/drivers/net/netdev_upperhalf.c
@@ -799,11 +799,18 @@ static void netdev_upper_work(FAR void *arg)
 
 static int netdev_upper_loop(int argc, FAR char *argv[])
 {
-  FAR struct netdev_upperhalf_s *upper =
-    (FAR struct netdev_upperhalf_s *)((uintptr_t)strtoul(argv[1], NULL, 16));
-  int cpu = atoi(argv[2]);
+  FAR struct netdev_upperhalf_s *upper;
+  int cpu;
   FAR struct netdev_thread_s *t = &upper->thread[cpu];
 
+  if (argc < 3)
+    {
+      return ERROR;
+    }
+
+  upper = (FAR struct netdev_upperhalf_s *)((uintptr_t)strtoul(argv[1], NULL, 16));
+  cpu = atoi(argv[2]);
+  
   if (upper->lower->rxtype == NETDEV_RX_THREAD_RSS)
     {
       cpu_set_t cpuset;
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
@@ -1378,6 +1378,11 @@ static int usbhost_kbdpoll(int argc, FAR char *argv[])
   int ret;
   uint8_t leds;
 
+  if (argc < 2)
+    {
+      return ERROR;
+    }
+  
   uinfo("Started\n");
 
   /* Synchronize with the start-up logic.  Get the private instance, re-start
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
@@ -957,6 +957,9 @@ static int usbhost_mouse_poll(int argc, FAR char *argv[])
   ssize_t nbytes;
   int ret = OK;
 
+  UNUSED(argc);
+  UNUSED(argv);
+  
   uinfo("Started\n");
 
   /* Synchronize with the start-up logic.  Get the private instance, re-start
diff --git a/drivers/usbmonitor/usbmonitor.c b/drivers/usbmonitor/usbmonitor.c
@@ -148,6 +148,9 @@ static int usbmonitor_tracecallback(struct usbtrace_s *trace, void *arg)
 
 static int usbmonitor_daemon(int argc, FAR char **argv)
 {
+  UNUSED(argc);
+  UNUSED(argv);
+
   uinfo("Running: %d\n", g_usbmonitor.pid);
 
   /* Loop until we detect that there is a request to stop. */
diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h
@@ -625,7 +625,11 @@
 /* Indicate that a local variable is not used */
 
 #  ifndef UNUSED
-#    define UNUSED(a) ((void)(1 || &(a)))
+#    if defined(__clang__) || defined(__GNUC__)
+#      define UNUSED(a) (void)(a)
+#    else
+#      define UNUSED(a) ((void)(1 || &(a)))
+#    endif
 #  endif
 
 #  if defined(__clang__)
diff --git a/sched/irq/irq_attach_thread.c b/sched/irq/irq_attach_thread.c
@@ -83,13 +83,23 @@ static int irq_thread_default_handler(int irq, FAR void *context,
 
 static int isr_thread_main(int argc, FAR char *argv[])
 {
-  int irq = atoi(argv[1]);
-  xcpt_t isr = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16));
-  xcpt_t isrthread = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16));
-  FAR void *arg = (FAR char *)((uintptr_t)strtoul(argv[4], NULL, 16));
+  int irq;
+  xcpt_t isr;
+  xcpt_t isrthread;
+  FAR void *arg;
   struct irq_thread_info_s info;
   sem_t sem;
 
+  if (argc < 5)
+    {
+      return ERROR;
+    }
+
+  irq = atoi(argv[1]);
+  isr = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16));
+  isrthread = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16));
+  arg = (FAR char *)((uintptr_t)strtoul(argv[4], NULL, 16));
+  
   info.sem = &sem;
   info.arg = arg;
   info.handler = isr;
diff --git a/sched/wqueue/kwork_thread.c b/sched/wqueue/kwork_thread.c
@@ -192,6 +192,11 @@ static int work_thread(int argc, FAR char *argv[])
   irqstate_t    flags;
   FAR void     *arg;
 
+  if (argc < 3)
+    {
+      return ERROR;
+    }
+
   /* Get the handle from argv */
 
   wqueue  = (FAR struct kwork_wqueue_s *)

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,9 @@ static int usbhost_waiter(int argc, char *argv[])`
`91`	`91`	`{`
`92`	`92`	`struct usbhost_hubport_s *hport;`
`93`	`93`
	`94`	`+ UNUSED(argc);`
	`95`	`+ UNUSED(argv);`
	`96`	`+`
`94`	`97`	`uinfo("Running\n");`
`95`	`98`	`for (; ; )`
`96`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ static int usbhost_waiter(int argc, char *argv[])`
`78`	`78`	`{`
`79`	`79`	`struct usbhost_hubport_s *hport;`
`80`	`80`
	`81`	`+ UNUSED(argc);`
	`82`	`+ UNUSED(argv);`
	`83`	`+`
`81`	`84`	`uinfo("Running\n");`
`82`	`85`	`for (; ; )`
`83`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,9 @@ static int usbhost_waiter(int argc, char *argv[])`
`89`	`89`	`{`
`90`	`90`	`struct usbhost_hubport_s *hport;`
`91`	`91`
	`92`	`+ UNUSED(argc);`
	`93`	`+ UNUSED(argv);`
	`94`	`+`
`92`	`95`	`uinfo("Running\n");`
`93`	`96`	`for (; ; )`
`94`	`97`	`{`