Skip to content

Commit 8df7165

Browse files
Jerin Jacobdavid-marchand
Jerin Jacob
authored and
david-marchand
committed
drivers: remove more redundant newline in Marvell drivers
Certain sections of the code in net/mvpp2 and ml/cnxk are enabled only when all library dependencies are met. Drop unneeded newline and fix build errors triggered with the check in RTE_LOG_LINE. Fixes: f665790 ("drivers: remove redundant newline from logs") Cc: [email protected] Signed-off-by: Jerin Jacob <[email protected]> Reviewed-by: David Marchand <[email protected]>
1 parent 41b09d6 commit 8df7165

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎drivers/ml/cnxk/mvtvm_ml_dev.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ mvtvm_mldev_parse_devargs(const char *args, struct mvtvm_ml_dev *mvtvm_mldev)
6363

6464
kvlist = rte_kvargs_parse(args, valid_args);
6565
if (kvlist == NULL) {
66-
plt_err("Error parsing %s devargs\n", "MLDEV_NAME_MVTVM_PMD");
66+
plt_err("Error parsing %s devargs", "MLDEV_NAME_MVTVM_PMD");
6767
return -EINVAL;
6868
}
6969

7070
if (rte_kvargs_count(kvlist, MVTVM_ML_DEV_MAX_QPS) == 1) {
7171
ret = rte_kvargs_process(kvlist, MVTVM_ML_DEV_MAX_QPS, &parse_uint_arg,
7272
&mvtvm_mldev->max_nb_qpairs);
7373
if (ret < 0) {
74-
plt_err("Error processing arguments, key = %s\n", MVTVM_ML_DEV_MAX_QPS);
74+
plt_err("Error processing arguments, key = %s", MVTVM_ML_DEV_MAX_QPS);
7575
ret = -EINVAL;
7676
goto exit;
7777
}
@@ -82,7 +82,7 @@ mvtvm_mldev_parse_devargs(const char *args, struct mvtvm_ml_dev *mvtvm_mldev)
8282
ret = rte_kvargs_process(kvlist, MVTVM_ML_DEV_CACHE_MODEL_DATA, &parse_integer_arg,
8383
&mvtvm_mldev->cache_model_data);
8484
if (ret < 0) {
85-
plt_err("Error processing arguments, key = %s\n",
85+
plt_err("Error processing arguments, key = %s",
8686
MVTVM_ML_DEV_CACHE_MODEL_DATA);
8787
ret = -EINVAL;
8888
goto exit;
@@ -99,7 +99,7 @@ mvtvm_mldev_parse_devargs(const char *args, struct mvtvm_ml_dev *mvtvm_mldev)
9999
mvtvm_mldev->cache_model_data = CN10K_ML_DEV_CACHE_MODEL_DATA_DEFAULT;
100100
} else {
101101
if ((mvtvm_mldev->cache_model_data < 0) || (mvtvm_mldev->cache_model_data > 1)) {
102-
plt_err("Invalid argument, %s = %d\n", MVTVM_ML_DEV_CACHE_MODEL_DATA,
102+
plt_err("Invalid argument, %s = %d", MVTVM_ML_DEV_CACHE_MODEL_DATA,
103103
mvtvm_mldev->cache_model_data);
104104
ret = -EINVAL;
105105
goto exit;

‎drivers/ml/cnxk/mvtvm_ml_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mvtvm_ml_model_type_get(struct rte_ml_model_params *params)
5050
/* Check if all objects are available */
5151
for (i = 0; i < ML_MVTVM_MODEL_OBJECT_MAX; i++) {
5252
if (!object_found[i]) {
53-
plt_err("Object %s not found in archive!\n", mvtvm_object_list[i]);
53+
plt_err("Object %s not found in archive!", mvtvm_object_list[i]);
5454
return ML_CNXK_MODEL_TYPE_INVALID;
5555
}
5656
}
@@ -100,7 +100,7 @@ mvtvm_ml_model_blob_parse(struct rte_ml_model_params *params, struct mvtvm_ml_mo
100100
/* Check if all objects are parsed */
101101
for (i = 0; i < ML_MVTVM_MODEL_OBJECT_MAX; i++) {
102102
if (!object_found[i]) {
103-
plt_err("Object %s not found in archive!\n", mvtvm_object_list[i]);
103+
plt_err("Object %s not found in archive!", mvtvm_object_list[i]);
104104
goto error;
105105
}
106106
}

‎drivers/ml/cnxk/mvtvm_ml_ops.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ mvtvm_ml_dev_configure(struct cnxk_ml_dev *cnxk_mldev, const struct rte_ml_dev_c
123123
/* Configure TVMDP library */
124124
ret = tvmdp_configure(cnxk_mldev->mldev->data->nb_models, rte_get_tsc_cycles);
125125
if (ret != 0)
126-
plt_err("TVMDP configuration failed, error = %d\n", ret);
126+
plt_err("TVMDP configuration failed, error = %d", ret);
127127

128128
return ret;
129129
}
@@ -138,7 +138,7 @@ mvtvm_ml_dev_close(struct cnxk_ml_dev *cnxk_mldev)
138138
/* Close TVMDP library configuration */
139139
ret = tvmdp_close();
140140
if (ret != 0)
141-
plt_err("TVMDP close failed, error = %d\n", ret);
141+
plt_err("TVMDP close failed, error = %d", ret);
142142

143143
return ret;
144144
}
@@ -296,7 +296,7 @@ mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *
296296
/* Get model metadata - stage 2 */
297297
ret = tvmdp_model_metadata_get_stage2(model->model_id, &model->mvtvm.metadata);
298298
if (ret != 0) {
299-
plt_err("TVMDP: Failed to get metadata, model_id = %u, error = %d\n",
299+
plt_err("TVMDP: Failed to get metadata, model_id = %u, error = %d",
300300
model->model_id, ret);
301301
goto error;
302302
}

‎drivers/net/mvpp2/mrvl_ethdev.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ mrvl_pp2_fixup_init(void)
215215
dummy_pool_id[i] = mrvl_reserve_bit(&used_bpools[i],
216216
PP2_BPOOL_NUM_POOLS);
217217
if (dummy_pool_id[i] < 0) {
218-
MRVL_LOG(ERR, "Can't find free pool\n");
218+
MRVL_LOG(ERR, "Can't find free pool");
219219
return -1;
220220
}
221221

@@ -227,7 +227,7 @@ mrvl_pp2_fixup_init(void)
227227
bpool_params.dummy_short_pool = 1;
228228
err = pp2_bpool_init(&bpool_params, &dummy_pool[i]);
229229
if (err != 0 || !dummy_pool[i]) {
230-
MRVL_LOG(ERR, "BPool init failed!\n");
230+
MRVL_LOG(ERR, "BPool init failed!");
231231
used_bpools[i] &= ~(1 << dummy_pool_id[i]);
232232
return -1;
233233
}
@@ -491,7 +491,7 @@ mrvl_dev_configure(struct rte_eth_dev *dev)
491491
}
492492

493493
if (dev->data->dev_conf.rxmode.mtu > priv->max_mtu) {
494-
MRVL_LOG(ERR, "MTU %u is larger than max_mtu %u\n",
494+
MRVL_LOG(ERR, "MTU %u is larger than max_mtu %u",
495495
dev->data->dev_conf.rxmode.mtu,
496496
priv->max_mtu);
497497
return -EINVAL;
@@ -770,7 +770,7 @@ static int mrvl_populate_vlan_table(struct rte_eth_dev *dev, int on)
770770
vbit >>= 1;
771771
ret = mrvl_vlan_filter_set(dev, vlan, on);
772772
if (ret) {
773-
MRVL_LOG(ERR, "Failed to setup VLAN filter\n");
773+
MRVL_LOG(ERR, "Failed to setup VLAN filter");
774774
return ret;
775775
}
776776
}
@@ -1875,7 +1875,7 @@ static int mrvl_vlan_offload_set(struct rte_eth_dev *dev, int mask)
18751875
int ret;
18761876

18771877
if (mask & RTE_ETH_VLAN_STRIP_MASK) {
1878-
MRVL_LOG(ERR, "VLAN stripping is not supported\n");
1878+
MRVL_LOG(ERR, "VLAN stripping is not supported");
18791879
return -ENOTSUP;
18801880
}
18811881

@@ -1890,7 +1890,7 @@ static int mrvl_vlan_offload_set(struct rte_eth_dev *dev, int mask)
18901890
}
18911891

18921892
if (mask & RTE_ETH_VLAN_EXTEND_MASK) {
1893-
MRVL_LOG(ERR, "Extend VLAN not supported\n");
1893+
MRVL_LOG(ERR, "Extend VLAN not supported");
18941894
return -ENOTSUP;
18951895
}
18961896

@@ -1941,7 +1941,7 @@ mrvl_fill_bpool(struct mrvl_rxq *rxq, int num)
19411941
!= cookie_addr_high) {
19421942
MRVL_LOG(ERR,
19431943
"mbuf virtual addr high is out of range "
1944-
"0x%x instead of 0x%x\n",
1944+
"0x%x instead of 0x%x",
19451945
(uint32_t)((uint64_t)mbufs[i] >> 32),
19461946
(uint32_t)(cookie_addr_high >> 32));
19471947
goto out;

‎drivers/net/mvpp2/mrvl_qos.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
500500
entry = rte_cfgfile_get_entry(file, sec_name,
501501
MRVL_TOK_PARSER_UDF_PROTO);
502502
if (!entry) {
503-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf,
503+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set", udf,
504504
MRVL_TOK_PARSER_UDF_PROTO);
505505
return -1;
506506
}
@@ -509,7 +509,7 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
509509
entry_field = rte_cfgfile_get_entry(file, sec_name,
510510
MRVL_TOK_PARSER_UDF_FIELD);
511511
if (!entry_field) {
512-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf,
512+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set", udf,
513513
MRVL_TOK_PARSER_UDF_FIELD);
514514
return -1;
515515
}
@@ -523,7 +523,7 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
523523
field_size = 2;
524524
} else {
525525
MRVL_LOG(ERR, "UDF[%d]: mismatch between '%s' proto "
526-
"and '%s' field\n", udf,
526+
"and '%s' field", udf,
527527
MRVL_TOK_PARSER_UDF_PROTO_ETH,
528528
entry_field);
529529
return -1;
@@ -537,45 +537,45 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
537537
field_size = 2;
538538
} else {
539539
MRVL_LOG(ERR, "UDF[%d]: mismatch between '%s' proto "
540-
"and '%s' field\n", udf,
540+
"and '%s' field", udf,
541541
MRVL_TOK_PARSER_UDF_PROTO_UDP,
542542
entry_field);
543543
return -1;
544544
}
545545
} else {
546-
MRVL_LOG(ERR, "UDF[%d]: Unsupported '%s' proto\n", udf, entry);
546+
MRVL_LOG(ERR, "UDF[%d]: Unsupported '%s' proto", udf, entry);
547547
return -1;
548548
}
549549

550550
snprintf(malloc_name, sizeof(malloc_name), "mrvl_udf_%d_key", udf);
551551
udf_params->match_key = rte_zmalloc(malloc_name, field_size, 0);
552552
if (udf_params->match_key == NULL) {
553-
MRVL_LOG(ERR, "Cannot allocate udf %d key\n", udf);
553+
MRVL_LOG(ERR, "Cannot allocate udf %d key", udf);
554554
return -1;
555555
}
556556
snprintf(malloc_name, sizeof(malloc_name), "mrvl_udf_%d_mask", udf);
557557
udf_params->match_mask = rte_zmalloc(malloc_name, field_size, 0);
558558
if (udf_params->match_mask == NULL) {
559-
MRVL_LOG(ERR, "Cannot allocate udf %d mask\n", udf);
559+
MRVL_LOG(ERR, "Cannot allocate udf %d mask", udf);
560560
return -1;
561561
}
562562

563563
/* Read 'key' field */
564564
entry = rte_cfgfile_get_entry(file, sec_name, MRVL_TOK_PARSER_UDF_KEY);
565565
if (!entry) {
566-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf,
566+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set", udf,
567567
MRVL_TOK_PARSER_UDF_KEY);
568568
return -1;
569569
}
570570

571571
if (strncmp(entry, "0x", 2) != 0) {
572-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must start with '0x'\n",
572+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must start with '0x'",
573573
udf, MRVL_TOK_PARSER_UDF_KEY);
574574
return -EINVAL;
575575
}
576576

577577
if (strlen(entry) != FIELD_LEN_IN_CHARS(field_size)) {
578-
MRVL_LOG(ERR, "UDF[%d]: '%s' field's len must be %d\n", udf,
578+
MRVL_LOG(ERR, "UDF[%d]: '%s' field's len must be %d", udf,
579579
MRVL_TOK_PARSER_UDF_KEY,
580580
FIELD_LEN_IN_CHARS(field_size));
581581
return -EINVAL;
@@ -588,7 +588,7 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
588588
if (get_val_securely8(tmp_arr, 16,
589589
&udf_params->match_key[i]) < 0) {
590590
MRVL_LOG(ERR, "UDF[%d]: '%s' field's value is not in "
591-
"hex format\n", udf, MRVL_TOK_PARSER_UDF_KEY);
591+
"hex format", udf, MRVL_TOK_PARSER_UDF_KEY);
592592
return -EINVAL;
593593
}
594594
entry += 2;
@@ -597,18 +597,18 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
597597
/* Read 'mask' field */
598598
entry = rte_cfgfile_get_entry(file, sec_name, MRVL_TOK_PARSER_UDF_MASK);
599599
if (!entry) {
600-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf,
600+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set", udf,
601601
MRVL_TOK_PARSER_UDF_MASK);
602602
return -1;
603603
}
604604
if (strncmp(entry, "0x", 2) != 0) {
605-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must start with '0x'\n",
605+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must start with '0x'",
606606
udf, MRVL_TOK_PARSER_UDF_MASK);
607607
return -EINVAL;
608608
}
609609

610610
if (strlen(entry) != FIELD_LEN_IN_CHARS(field_size)) {
611-
MRVL_LOG(ERR, "UDF[%d]: '%s' field's len must be %d\n", udf,
611+
MRVL_LOG(ERR, "UDF[%d]: '%s' field's len must be %d", udf,
612612
MRVL_TOK_PARSER_UDF_MASK,
613613
FIELD_LEN_IN_CHARS(field_size));
614614
return -EINVAL;
@@ -621,7 +621,7 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
621621
if (get_val_securely8(tmp_arr, 16,
622622
&udf_params->match_mask[i]) < 0) {
623623
MRVL_LOG(ERR, "UDF[%d]: '%s' field's value is not in "
624-
"hex format\n", udf, MRVL_TOK_PARSER_UDF_MASK);
624+
"hex format", udf, MRVL_TOK_PARSER_UDF_MASK);
625625
return -EINVAL;
626626
}
627627
entry += 2;
@@ -631,7 +631,7 @@ parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf,
631631
entry = rte_cfgfile_get_entry(file, sec_name,
632632
MRVL_TOK_PARSER_UDF_OFFSET);
633633
if (!entry) {
634-
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf,
634+
MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set", udf,
635635
MRVL_TOK_PARSER_UDF_OFFSET);
636636
return -1;
637637
}
@@ -663,7 +663,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
663663
char sec_name[32];
664664

665665
if (file == NULL) {
666-
MRVL_LOG(ERR, "Cannot load configuration %s\n", path);
666+
MRVL_LOG(ERR, "Cannot load configuration %s", path);
667667
return -1;
668668
}
669669

@@ -672,7 +672,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
672672
*/
673673
*cfg = rte_zmalloc("mrvl_cfg", sizeof(struct mrvl_cfg), 0);
674674
if (*cfg == NULL) {
675-
MRVL_LOG(ERR, "Cannot allocate configuration %s\n", path);
675+
MRVL_LOG(ERR, "Cannot allocate configuration %s", path);
676676
return -1;
677677
}
678678

@@ -681,7 +681,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
681681
sizeof(MRVL_TOK_PARSER_UDF) - 1);
682682

683683
if (n && n > PP2_MAX_UDFS_SUPPORTED) {
684-
MRVL_LOG(ERR, "found %d udf sections, but only %d are supported\n",
684+
MRVL_LOG(ERR, "found %d udf sections, but only %d are supported",
685685
n, PP2_MAX_UDFS_SUPPORTED);
686686
return -1;
687687
}
@@ -693,14 +693,14 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
693693
/* udf sections must be sequential. */
694694
if (rte_cfgfile_num_sections(file, sec_name,
695695
strlen(sec_name)) <= 0) {
696-
MRVL_LOG(ERR, "udf sections must be sequential (0 - %d)\n",
696+
MRVL_LOG(ERR, "udf sections must be sequential (0 - %d)",
697697
PP2_MAX_UDFS_SUPPORTED - 1);
698698
return -1;
699699
}
700700

701701
ret = parse_udf(file, sec_name, i, *cfg);
702702
if (ret) {
703-
MRVL_LOG(ERR, "Error in parsing %s!\n", sec_name);
703+
MRVL_LOG(ERR, "Error in parsing %s!", sec_name);
704704
return -1;
705705
}
706706
}
@@ -763,7 +763,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
763763
PP2_PPIO_HDR_ETH_EXT_DSA;
764764
} else {
765765
MRVL_LOG(ERR,
766-
"Error in parsing %s value (%s)!\n",
766+
"Error in parsing %s value (%s)!",
767767
MRVL_TOK_START_HDR, entry);
768768
return -1;
769769
}
@@ -823,7 +823,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
823823
PP2_CLS_QOS_TBL_VLAN_PRI;
824824
} else {
825825
MRVL_LOG(ERR,
826-
"Error in parsing %s value (%s)!\n",
826+
"Error in parsing %s value (%s)!",
827827
MRVL_TOK_MAPPING_PRIORITY, entry);
828828
return -1;
829829
}
@@ -851,7 +851,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
851851
ret = get_outq_cfg(file, n, i, *cfg);
852852
if (ret < 0) {
853853
MRVL_LOG(ERR,
854-
"Error %d parsing port %d outq %d!\n",
854+
"Error %d parsing port %d outq %d!",
855855
ret, n, i);
856856
return -1;
857857
}
@@ -861,7 +861,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
861861
ret = parse_tc_cfg(file, n, i, *cfg);
862862
if (ret < 0) {
863863
MRVL_LOG(ERR,
864-
"Error %d parsing port %d tc %d!\n",
864+
"Error %d parsing port %d tc %d!",
865865
ret, n, i);
866866
return -1;
867867
}
@@ -889,7 +889,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
889889
if (entry) {
890890
if (get_val_securely(entry, &val) < 0) {
891891
MRVL_LOG(ERR,
892-
"Error in parsing %s value (%s)!\n",
892+
"Error in parsing %s value (%s)!",
893893
MRVL_TOK_FWD_BAD_FRAMES, entry);
894894
return -1;
895895
}
@@ -904,7 +904,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
904904
if (entry) {
905905
if (get_val_securely(entry, &val) < 0) {
906906
MRVL_LOG(ERR,
907-
"Error in parsing %s value (%s)!\n",
907+
"Error in parsing %s value (%s)!",
908908
MRVL_TOK_FILL_BPOOL_BUFFS, entry);
909909
return -1;
910910
}
@@ -972,7 +972,7 @@ setup_policer(struct mrvl_priv *priv, struct pp2_cls_plcr_params *params)
972972
*
973973
* Lets use 0th then.
974974
*/
975-
sprintf(match, "policer-%d:%d\n", priv->pp_id, 0);
975+
sprintf(match, "policer-%d:%d", priv->pp_id, 0);
976976
params->match = match;
977977

978978
ret = pp2_cls_plcr_init(params, &priv->default_policer);

0 commit comments

Comments
 (0)