Skip to content

Commit ee1444b

Browse files
jbrandebkuba-moo
authored andcommitted
dim: initialize all struct fields
The W=2 build pointed out that the code wasn't initializing all the variables in the dim_cq_moder declarations with the struct initializers. The net change here is zero since these structs were already static const globals and were initialized with zeros by the compiler, but removing compiler warnings has value in and of itself. lib/dim/net_dim.c: At top level: lib/dim/net_dim.c:54:9: warning: missing initializer for field ‘comps’ of ‘const struct dim_cq_moder’ [-Wmissing-field-initializers] 54 | NET_DIM_RX_EQE_PROFILES, | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from lib/dim/net_dim.c:6: ./include/linux/dim.h:45:13: note: ‘comps’ declared here 45 | u16 comps; | ^~~~~ and repeats for the tx struct, and once you fix the comps entry then the cq_period_mode field needs the same treatment. Use the commonly accepted style to indicate to the compiler that we know what we're doing, and add a comma at the end of each struct initializer to clean up the issue, and use explicit initializers for the fields we are initializing which makes the compiler happy. While here and fixing these lines, clean up the code slightly with a fix for the super long lines by removing the word "_MODERATION" from a couple defines only used in this file. Fixes: f8be17b ("lib/dim: Fix -Wunused-const-variable warnings") Signed-off-by: Jesse Brandeburg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 4bd46bb commit ee1444b

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

lib/dim/net_dim.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,41 @@
1212
* Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES
1313
*/
1414
#define NET_DIM_PARAMS_NUM_PROFILES 5
15-
#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
16-
#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128
15+
#define NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE 256
16+
#define NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE 128
1717
#define NET_DIM_DEF_PROFILE_CQE 1
1818
#define NET_DIM_DEF_PROFILE_EQE 1
1919

2020
#define NET_DIM_RX_EQE_PROFILES { \
21-
{1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
22-
{8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
23-
{64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
24-
{128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
25-
{256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
21+
{.usec = 1, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \
22+
{.usec = 8, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \
23+
{.usec = 64, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \
24+
{.usec = 128, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \
25+
{.usec = 256, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,} \
2626
}
2727

2828
#define NET_DIM_RX_CQE_PROFILES { \
29-
{2, 256}, \
30-
{8, 128}, \
31-
{16, 64}, \
32-
{32, 64}, \
33-
{64, 64} \
29+
{.usec = 2, .pkts = 256,}, \
30+
{.usec = 8, .pkts = 128,}, \
31+
{.usec = 16, .pkts = 64,}, \
32+
{.usec = 32, .pkts = 64,}, \
33+
{.usec = 64, .pkts = 64,} \
3434
}
3535

3636
#define NET_DIM_TX_EQE_PROFILES { \
37-
{1, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
38-
{8, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
39-
{32, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
40-
{64, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \
41-
{128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE} \
37+
{.usec = 1, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \
38+
{.usec = 8, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \
39+
{.usec = 32, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \
40+
{.usec = 64, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \
41+
{.usec = 128, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,} \
4242
}
4343

4444
#define NET_DIM_TX_CQE_PROFILES { \
45-
{5, 128}, \
46-
{8, 64}, \
47-
{16, 32}, \
48-
{32, 32}, \
49-
{64, 32} \
45+
{.usec = 5, .pkts = 128,}, \
46+
{.usec = 8, .pkts = 64,}, \
47+
{.usec = 16, .pkts = 32,}, \
48+
{.usec = 32, .pkts = 32,}, \
49+
{.usec = 64, .pkts = 32,} \
5050
}
5151

5252
static const struct dim_cq_moder

0 commit comments

Comments
 (0)