imx31: Work around an apparently not-quite-kosher abuse of CPP

(we were trying to foward-declare functions from within static
 initializer context.  GCC no longer accepts this)

Change-Id: I58f316ecc84c8ab45fffc054955727a55714b0a3

1 files changed, 5 insertions, 4 deletions

diff --git a/firmware/target/arm/imx31/gpio-imx31.h b/firmware/target/arm/imx31/gpio-imx31.h
index 86ca964f94..e02896f4c3 100644
--- a/firmware/target/arm/imx31/gpio-imx31.h
+++ b/firmware/target/arm/imx31/gpio-imx31.h
@@ -166,11 +166,12 @@ struct gpio_event
     {                                                                 \
         static const struct gpio_event __tbl[] = {
 
+#define GPIO_EVENT_VECTOR_CB(__name)     void __name##_EVENT_CB(void)
+
 #define GPIO_EVENT_VECTOR(__name, __sense) \
-            { .id       = (__name##_ID),                   \
-              .sense    = (__sense),                       \
-              .callback = ({ void __name##_EVENT_CB(void); \
-                             __name##_EVENT_CB; }) },
+        { .id       = (__name##_ID),       \
+          .sense    = (__sense),           \
+          .callback = (__name##_EVENT_CB) },
 
 #define GPIO_VECTOR_TBL_END() \
         };                                              \