Revert "teensy3: usb_desc: Extract EMIT_CDC_IAD_DESCRIPTOR() macro"

This reverts commit a0ea852ed0.

teensy3/usb_desc.c

@@ -594,17 +594,6 @@ static uint8_t flightsim_report_desc[] = {
 //   USB Configuration
 // **************************************************************
 
-#define EMIT_CDC_IAD_DESCRIPTOR(prefix)                                        \
-        /* interface association descriptor, USB ECN, Table 9-Z */             \
-        8,                                      /* bLength */                  \
-        11,                                     /* bDescriptorType */          \
-        prefix ## _STATUS_INTERFACE,            /* bFirstInterface */          \
-        2,                                      /* bInterfaceCount */          \
-        0x02,                                   /* bFunctionClass */           \
-        0x02,                                   /* bFunctionSubClass */        \
-        0x01,                                   /* bFunctionProtocol */        \
-        0                                       /* iFunction */
-
 #define EMIT_CDC_DESCRIPTORS(prefix)                                           \
         /* interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 */   \
         9,                                      /* bLength */                  \
@@ -685,7 +674,15 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = {
         50,                                     // bMaxPower
 
 #ifdef CDC_IAD_DESCRIPTOR
-        EMIT_CDC_IAD_DESCRIPTOR(CDC),
+        // interface association descriptor, USB ECN, Table 9-Z
+        8,                                      // bLength
+        11,                                     // bDescriptorType
+        CDC_STATUS_INTERFACE,                   // bFirstInterface
+        2,                                      // bInterfaceCount
+        0x02,                                   // bFunctionClass
+        0x02,                                   // bFunctionSubClass
+        0x01,                                   // bFunctionProtocol
+        0,                                      // iFunction
 #endif
 
 #ifdef CDC_DATA_INTERFACE