usb: gadget: f_ncm: noop - remove INIT_NDP{16,32}_OPTS macros

these are only used in one place, a few lines lower

Cc: Brooke Basile <brookebasile@gmail.com>
Cc: "Bryan O'Donoghue" <bryan.odonoghue@linaro.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Link: https://lore.kernel.org/r/20220821145745.122587-1-zenczykowski@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index dc8f078f918c515540f1ad95031d41ef6bbc57d7..c36bcfa0e9b46f17e85e7731fe12ca1a28a769a9 100644 (file)
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -450,39 +450,35 @@ struct ndp_parser_opts {
        unsigned        next_ndp_index;
 };
 
-#define INIT_NDP16_OPTS {                                      \
-               .nth_sign = USB_CDC_NCM_NTH16_SIGN,             \
-               .ndp_sign = USB_CDC_NCM_NDP16_NOCRC_SIGN,       \
-               .nth_size = sizeof(struct usb_cdc_ncm_nth16),   \
-               .ndp_size = sizeof(struct usb_cdc_ncm_ndp16),   \
-               .dpe_size = sizeof(struct usb_cdc_ncm_dpe16),   \
-               .ndplen_align = 4,                              \
-               .dgram_item_len = 1,                            \
-               .block_length = 1,                              \
-               .ndp_index = 1,                                 \
-               .reserved1 = 0,                                 \
-               .reserved2 = 0,                                 \
-               .next_ndp_index = 1,                            \
-       }
-
-
-#define INIT_NDP32_OPTS {                                      \
-               .nth_sign = USB_CDC_NCM_NTH32_SIGN,             \
-               .ndp_sign = USB_CDC_NCM_NDP32_NOCRC_SIGN,       \
-               .nth_size = sizeof(struct usb_cdc_ncm_nth32),   \
-               .ndp_size = sizeof(struct usb_cdc_ncm_ndp32),   \
-               .dpe_size = sizeof(struct usb_cdc_ncm_dpe32),   \
-               .ndplen_align = 8,                              \
-               .dgram_item_len = 2,                            \
-               .block_length = 2,                              \
-               .ndp_index = 2,                                 \
-               .reserved1 = 1,                                 \
-               .reserved2 = 2,                                 \
-               .next_ndp_index = 2,                            \
-       }
+static const struct ndp_parser_opts ndp16_opts = {
+       .nth_sign = USB_CDC_NCM_NTH16_SIGN,
+       .ndp_sign = USB_CDC_NCM_NDP16_NOCRC_SIGN,
+       .nth_size = sizeof(struct usb_cdc_ncm_nth16),
+       .ndp_size = sizeof(struct usb_cdc_ncm_ndp16),
+       .dpe_size = sizeof(struct usb_cdc_ncm_dpe16),
+       .ndplen_align = 4,
+       .dgram_item_len = 1,
+       .block_length = 1,
+       .ndp_index = 1,
+       .reserved1 = 0,
+       .reserved2 = 0,
+       .next_ndp_index = 1,
+};
 
-static const struct ndp_parser_opts ndp16_opts = INIT_NDP16_OPTS;
-static const struct ndp_parser_opts ndp32_opts = INIT_NDP32_OPTS;
+static const struct ndp_parser_opts ndp32_opts = {
+       .nth_sign = USB_CDC_NCM_NTH32_SIGN,
+       .ndp_sign = USB_CDC_NCM_NDP32_NOCRC_SIGN,
+       .nth_size = sizeof(struct usb_cdc_ncm_nth32),
+       .ndp_size = sizeof(struct usb_cdc_ncm_ndp32),
+       .dpe_size = sizeof(struct usb_cdc_ncm_dpe32),
+       .ndplen_align = 8,
+       .dgram_item_len = 2,
+       .block_length = 2,
+       .ndp_index = 2,
+       .reserved1 = 1,
+       .reserved2 = 2,
+       .next_ndp_index = 2,
+};
 
 static inline void put_ncm(__le16 **p, unsigned size, unsigned val)
 {