Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1403634ybz; Thu, 16 Apr 2020 08:34:16 -0700 (PDT) X-Google-Smtp-Source: APiQypJMsKvJ817aN47eYMBC74HHdPmDkY/P8e7KEAGD4X/F9u7v9ajgCE5jWJw8C1Dd/SzG1C2x X-Received: by 2002:a17:906:9450:: with SMTP id z16mr9981209ejx.166.1587051256458; Thu, 16 Apr 2020 08:34:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587051256; cv=none; d=google.com; s=arc-20160816; b=FYIfFKmtyeejxmpkgCchWHWgmV8jF7I1gxogIqY4GmHfvW4xWf4L49sXv+RbLNVWPO +1M2WdnANyoPMEM3LhBT8OZO4asteaRpPYcuCrugoeGyD6hP+At/fZrs9s7FkCjqZg3c g9wn4LxQQCKLWrb/q8S9mu3afFTwVX9Wsi/HuOM7mo1jujYNMzpSuiXxOqFNRCBWA9gQ T0AWHbwkND1/RJlvsVB8rCgGcJLPCAmwoQ8/mbf/qq+7T+8QiFEUd4fPc7zT0aXolzKV VxZnMLZQyaMfiC6k9I7Fo42bbEpqYOjZp1R5aNUeiL+E9WYvOt44XR+SlZeyXj/8IG7U 7WOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kMUrm483UUD3agORH0fREu+2EJMe4ZLtOZ9SMBeNcPQ=; b=xAj3BVO3VZfsclMiKMPal9fq/ojTrV52BJf5qGI0ajxfxaGF5DfDq900I/opdcn0eA uDmFuunicEWiiHnb9nqrl0agjHhR952by32f7VxCdzGp+qe67XubexoXsHfABdyTaRdB tQYwcrek7qriR4HPdXx8U+kjd1TJ2bR1qkssqiLwC220fFyJFyqAe8Dm77unRVocQ6Ty Zk3XA/GG5ZikXYzKPT5C+ZFyyI6Wm5qlockrNZXu+xke7KEomH2hUOW4VBTM7l6+z8ZB ghR8GkSpeJ6qtX9iNnHHs87xqqjdc7FfGbXloltNHaWcD8GudRSrehkmneGZ1aPhy6EM uSwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OR+cNrqJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p16si6208811ejz.195.2020.04.16.08.33.52; Thu, 16 Apr 2020 08:34:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OR+cNrqJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410376AbgDPPb4 (ORCPT + 99 others); Thu, 16 Apr 2020 11:31:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:55806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441560AbgDPNmn (ORCPT ); Thu, 16 Apr 2020 09:42:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EEB0F214D8; Thu, 16 Apr 2020 13:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044562; bh=aJGDApDJxafW+Vlm41KJkKg+iMU290np3OMqekDT3+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OR+cNrqJI99dV1MX6QebsPrlsGJVfRgVqCkCEHM+FSSJ/EO2GUCDkhdnH1E8WzN+Z pslh3WgEvUyGcNKVm9SL8eBQK3RigaQEDRS9oAvCsKZTwpOoO36oXuHQsBDT5BOxXM vex5HcgYw/RNMLp3pFX3TNh5YaxSjmet62BoOPiQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zheng Wei , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 011/232] net: vxge: fix wrong __VA_ARGS__ usage Date: Thu, 16 Apr 2020 15:21:45 +0200 Message-Id: <20200416131317.819053358@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131316.640996080@linuxfoundation.org> References: <20200416131316.640996080@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheng Wei [ 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 e678ba379598e..628fa9b2f7416 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.h +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h @@ -2045,7 +2045,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