lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 004/146] net: vxge: fix wrong __VA_ARGS__ usage
    Date
    From: Zheng Wei <wei.zheng@vivo.com>

    [ Upstream commit b317538c47943f9903860d83cc0060409e12d2ff ]

    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 <wei.zheng@vivo.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +-
    drivers/net/ethernet/neterion/vxge/vxge-main.h | 14 +++++++-------
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
    index d743a37a3cee8..e5dda2c27f187 100644
    --- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
    +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
    @@ -2065,7 +2065,7 @@ vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask);
    if ((level >= VXGE_ERR && VXGE_COMPONENT_LL & VXGE_DEBUG_ERR_MASK) || \
    (level >= VXGE_TRACE && VXGE_COMPONENT_LL & VXGE_DEBUG_TRACE_MASK))\
    if ((mask & VXGE_DEBUG_MASK) == mask) \
    - printk(fmt "\n", __VA_ARGS__); \
    + printk(fmt "\n", ##__VA_ARGS__); \
    } while (0)
    #else
    #define vxge_debug_ll(level, mask, fmt, ...)
    diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
    index 59a57ff5e96af..9c86f4f9cd424 100644
    --- a/drivers/net/ethernet/neterion/vxge/vxge-main.h
    +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.h
    @@ -452,49 +452,49 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);

    #if (VXGE_DEBUG_LL_CONFIG & VXGE_DEBUG_MASK)
    #define vxge_debug_ll_config(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_ll_config(level, fmt, ...)
    #endif

    #if (VXGE_DEBUG_INIT & VXGE_DEBUG_MASK)
    #define vxge_debug_init(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_init(level, fmt, ...)
    #endif

    #if (VXGE_DEBUG_TX & VXGE_DEBUG_MASK)
    #define vxge_debug_tx(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_tx(level, fmt, ...)
    #endif

    #if (VXGE_DEBUG_RX & VXGE_DEBUG_MASK)
    #define vxge_debug_rx(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_rx(level, fmt, ...)
    #endif

    #if (VXGE_DEBUG_MEM & VXGE_DEBUG_MASK)
    #define vxge_debug_mem(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_mem(level, fmt, ...)
    #endif

    #if (VXGE_DEBUG_ENTRYEXIT & VXGE_DEBUG_MASK)
    #define vxge_debug_entryexit(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_entryexit(level, fmt, ...)
    #endif

    #if (VXGE_DEBUG_INTR & VXGE_DEBUG_MASK)
    #define vxge_debug_intr(level, fmt, ...) \
    - vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, __VA_ARGS__)
    + vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, ##__VA_ARGS__)
    #else
    #define vxge_debug_intr(level, fmt, ...)
    #endif
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-04-16 18:03    [W:4.078 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site