Skip to content

Commit b317538

Browse files
Zheng Weidavem330
authored andcommitted
net: vxge: fix wrong __VA_ARGS__ usage
printk in macro vxge_debug_ll uses __VA_ARGS__ without "##" prefix, it causes a build error when there is no variable arguments(e.g. only fmt is specified.). Signed-off-by: Zheng Wei <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 83d0010 commit b317538

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

drivers/net/ethernet/neterion/vxge/vxge-config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2045,7 +2045,7 @@ vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask);
20452045
if ((level >= VXGE_ERR && VXGE_COMPONENT_LL & VXGE_DEBUG_ERR_MASK) || \
20462046
(level >= VXGE_TRACE && VXGE_COMPONENT_LL & VXGE_DEBUG_TRACE_MASK))\
20472047
if ((mask & VXGE_DEBUG_MASK) == mask) \
2048-
printk(fmt "\n", __VA_ARGS__); \
2048+
printk(fmt "\n", ##__VA_ARGS__); \
20492049
} while (0)
20502050
#else
20512051
#define vxge_debug_ll(level, mask, fmt, ...)

drivers/net/ethernet/neterion/vxge/vxge-main.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -452,49 +452,49 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);
452452

453453
#if (VXGE_DEBUG_LL_CONFIG & VXGE_DEBUG_MASK)
454454
#define vxge_debug_ll_config(level, fmt, ...) \
455-
vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, __VA_ARGS__)
455+
vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, ##__VA_ARGS__)
456456
#else
457457
#define vxge_debug_ll_config(level, fmt, ...)
458458
#endif
459459

460460
#if (VXGE_DEBUG_INIT & VXGE_DEBUG_MASK)
461461
#define vxge_debug_init(level, fmt, ...) \
462-
vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, __VA_ARGS__)
462+
vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, ##__VA_ARGS__)
463463
#else
464464
#define vxge_debug_init(level, fmt, ...)
465465
#endif
466466

467467
#if (VXGE_DEBUG_TX & VXGE_DEBUG_MASK)
468468
#define vxge_debug_tx(level, fmt, ...) \
469-
vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, __VA_ARGS__)
469+
vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, ##__VA_ARGS__)
470470
#else
471471
#define vxge_debug_tx(level, fmt, ...)
472472
#endif
473473

474474
#if (VXGE_DEBUG_RX & VXGE_DEBUG_MASK)
475475
#define vxge_debug_rx(level, fmt, ...) \
476-
vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, __VA_ARGS__)
476+
vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, ##__VA_ARGS__)
477477
#else
478478
#define vxge_debug_rx(level, fmt, ...)
479479
#endif
480480

481481
#if (VXGE_DEBUG_MEM & VXGE_DEBUG_MASK)
482482
#define vxge_debug_mem(level, fmt, ...) \
483-
vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, __VA_ARGS__)
483+
vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, ##__VA_ARGS__)
484484
#else
485485
#define vxge_debug_mem(level, fmt, ...)
486486
#endif
487487

488488
#if (VXGE_DEBUG_ENTRYEXIT & VXGE_DEBUG_MASK)
489489
#define vxge_debug_entryexit(level, fmt, ...) \
490-
vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, __VA_ARGS__)
490+
vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, ##__VA_ARGS__)
491491
#else
492492
#define vxge_debug_entryexit(level, fmt, ...)
493493
#endif
494494

495495
#if (VXGE_DEBUG_INTR & VXGE_DEBUG_MASK)
496496
#define vxge_debug_intr(level, fmt, ...) \
497-
vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, __VA_ARGS__)
497+
vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, ##__VA_ARGS__)
498498
#else
499499
#define vxge_debug_intr(level, fmt, ...)
500500
#endif

0 commit comments

Comments
 (0)