From bcb4409756ed39a92433f9ac9ced559734a66326 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 4 Oct 2019 09:10:15 -0600
Subject: [PATCH] sched/wdog/wd_start.c:  Back out a kludge-workaround for an
 SDCC compiler problem fix back in Feb 2017 by commit b8f3bd857be.  That
 workaround now appears to conflict with newer GCC versions using unsupport
 warning options.

---
 sched/wdog/wd_start.c | 73 +++++++++++--------------------------------
 1 file changed, 18 insertions(+), 55 deletions(-)

diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c
index 6f4fa2f907..1f7c3a849a 100644
--- a/sched/wdog/wd_start.c
+++ b/sched/wdog/wd_start.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * sched/wdog/wd_start.c
  *
- *   Copyright (C) 2007-2009, 2012, 2014, 2016, 2018 Gregory Nutt.  All
+ *   Copyright (C) 2007-2009, 2012, 2014, 2016, 2018-2019 Gregory Nutt.  All
  *     rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
@@ -67,26 +67,6 @@
 #  define MAX(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
-/****************************************************************************
- * Private Type Declarations
- ****************************************************************************/
-
-typedef void (*wdentry0_t)(int argc);
-#if CONFIG_MAX_WDOGPARMS > 0
-typedef void (*wdentry1_t)(int argc, wdparm_t arg1);
-#endif
-#if CONFIG_MAX_WDOGPARMS > 1
-typedef void (*wdentry2_t)(int argc, wdparm_t arg1, wdparm_t arg2);
-#endif
-#if CONFIG_MAX_WDOGPARMS > 2
-typedef void (*wdentry3_t)(int argc, wdparm_t arg1, wdparm_t arg2,
-                           wdparm_t arg3);
-#endif
-#if CONFIG_MAX_WDOGPARMS > 3
-typedef void (*wdentry4_t)(int argc, wdparm_t arg1, wdparm_t arg2,
-                           wdparm_t arg3, wdparm_t arg4);
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -141,42 +121,25 @@ static inline void wd_expiration(void)
           /* Execute the watchdog function */
 
           up_setpicbase(wdog->picbase);
-          switch (wdog->argc)
-            {
-              default:
-                DEBUGPANIC();
-                break;
 
-              case 0:
-                (*((wdentry0_t)(wdog->func)))(0);
-                break;
-
-#if CONFIG_MAX_WDOGPARMS > 0
-              case 1:
-                (*((wdentry1_t)(wdog->func)))(1, wdog->parm[0]);
-                break;
+#if CONFIG_MAX_WDOGPARMS == 0
+          wdog->func(0);
+#elif CONFIG_MAX_WDOGPARMS == 1
+          wdog->func((int)wdog->argc,
+                     wdog->parm[0]);
+#elif CONFIG_MAX_WDOGPARMS == 2
+          wdog->func((int)wdog->argc,
+                     wdog->parm[0], wdog->parm[1]);
+#elif CONFIG_MAX_WDOGPARMS == 3
+          wdog->func((int)wdog->argc,
+                     wdog->parm[0], wdog->parm[1], wdog->parm[2]);
+#elif CONFIG_MAX_WDOGPARMS == 4
+          wdog->func((int)wdog->argc,
+                     wdog->parm[0], wdog->parm[1], wdog->parm[2],
+                     wdog->parm[3]);
+#else
+#  error Missing support
 #endif
-#if CONFIG_MAX_WDOGPARMS > 1
-              case 2:
-                (*((wdentry2_t)(wdog->func)))(2,
-                                wdog->parm[0], wdog->parm[1]);
-                break;
-#endif
-#if CONFIG_MAX_WDOGPARMS > 2
-              case 3:
-                (*((wdentry3_t)(wdog->func)))(3,
-                                wdog->parm[0], wdog->parm[1],
-                                wdog->parm[2]);
-                break;
-#endif
-#if CONFIG_MAX_WDOGPARMS > 3
-              case 4:
-                (*((wdentry4_t)(wdog->func)))(4,
-                                wdog->parm[0], wdog->parm[1],
-                                wdog->parm[2], wdog->parm[3]);
-                break;
-#endif
-            }
         }
     }
 }