[PATCH] IB/uverbs: Add missing braces in anonymous union initializers
From: Geert Uytterhoeven
Date: Mon Apr 09 2018 - 10:52:56 EST
With gcc-4.1.2:
drivers/infiniband/core/uverbs_std_types_flow_action.c:366: error: unknown field âptrâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:367: error: unknown field âtypeâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:367: warning: missing braces around initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:367: warning: (near initialization for âuverbs_flow_action_esp_keymat[0].<anonymous>.<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:368: error: unknown field âmin_lenâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:368: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:368: warning: (near initialization for âuverbs_flow_action_esp_keymat[0].<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:368: error: unknown field âlenâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:368: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:368: warning: (near initialization for âuverbs_flow_action_esp_keymat[0].<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:369: error: unknown field âflagsâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:369: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:369: warning: (near initialization for âuverbs_flow_action_esp_keymat[0].<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:376: error: unknown field âptrâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:377: error: unknown field âtypeâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:377: warning: missing braces around initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:377: warning: (near initialization for âuverbs_flow_action_esp_replay[0].<anonymous>.<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:379: error: unknown field âlenâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:379: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:379: warning: (near initialization for âuverbs_flow_action_esp_replay[0].<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:383: error: unknown field âptrâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:384: error: unknown field âtypeâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:385: error: unknown field âmin_lenâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:385: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:385: warning: (near initialization for âuverbs_flow_action_esp_replay[1].<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:385: error: unknown field âlenâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:385: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:385: warning: (near initialization for âuverbs_flow_action_esp_replay[1].<anonymous>â)
drivers/infiniband/core/uverbs_std_types_flow_action.c:386: error: unknown field âflagsâ specified in initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:386: warning: excess elements in union initializer
drivers/infiniband/core/uverbs_std_types_flow_action.c:386: warning: (near initialization for âuverbs_flow_action_esp_replay[1].<anonymous>â)
Add the missing braces to fix this.
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
Presumably also needed for Andrew's gcc-4.4.4.
Unfortunately I don't know how to fix the remaining warnings:
drivers/infiniband/core/uverbs_std_types_flow_action.c:391: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_flow_action.c:408: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_flow_action.c:423: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_flow_action.c:430: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_cq.c:149: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_cq.c:194: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_cq.c:202: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_dm.c:86: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_dm.c:97: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_dm.c:104: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_mr.c:118: warning: initialization from incompatible pointer type
drivers/infiniband/core/uverbs_std_types_mr.c:144: warning: initialization from incompatible pointer type
Smallest variable declaration exposing the problem:
static const struct uverbs_method_def bad = {
.attrs = &(const struct uverbs_attr_def * const []) { }
};
---
drivers/infiniband/core/uverbs_std_types_flow_action.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/core/uverbs_std_types_flow_action.c b/drivers/infiniband/core/uverbs_std_types_flow_action.c
index cbcec3da12f68505..b4f016dfa23dbbcf 100644
--- a/drivers/infiniband/core/uverbs_std_types_flow_action.c
+++ b/drivers/infiniband/core/uverbs_std_types_flow_action.c
@@ -363,28 +363,28 @@ static int UVERBS_HANDLER(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY)(struct ib_device
static const struct uverbs_attr_spec uverbs_flow_action_esp_keymat[] = {
[IB_UVERBS_FLOW_ACTION_ESP_KEYMAT_AES_GCM] = {
- .ptr = {
+ { .ptr = {
.type = UVERBS_ATTR_TYPE_PTR_IN,
UVERBS_ATTR_TYPE(struct ib_uverbs_flow_action_esp_keymat_aes_gcm),
.flags = UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO,
- },
+ } },
},
};
static const struct uverbs_attr_spec uverbs_flow_action_esp_replay[] = {
[IB_UVERBS_FLOW_ACTION_ESP_REPLAY_NONE] = {
- .ptr = {
+ { .ptr = {
.type = UVERBS_ATTR_TYPE_PTR_IN,
/* No need to specify any data */
.len = 0,
- }
+ } }
},
[IB_UVERBS_FLOW_ACTION_ESP_REPLAY_BMP] = {
- .ptr = {
+ { .ptr = {
.type = UVERBS_ATTR_TYPE_PTR_IN,
UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_replay_bmp, size),
.flags = UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO,
- }
+ } }
},
};
--
2.7.4