Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp641842ybz; Wed, 22 Apr 2020 05:20:19 -0700 (PDT) X-Google-Smtp-Source: APiQypJat6w+deQB5B5AvsLyv/XqyFZ3S5KoFEDlAvQrvVBl99NbWRZCPf6Jh5mlo5gN0VLCmBuV X-Received: by 2002:a17:906:704c:: with SMTP id r12mr8845365ejj.105.1587558019304; Wed, 22 Apr 2020 05:20:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587558019; cv=none; d=google.com; s=arc-20160816; b=0Il+wSXCvwPK13nRj6q9pQ4GBRXF6Ek3gjmACQbg0domy/9bETk4P0FBpBgHXknhJi a8Y0kqjePKg+LkY0yLvT7FplV5T0Kq1r9HSXKi/tZyMEeWuYxL4N7BTWQz3Q6b45yfuJ nADMVOwmb9h03nmfbvSlQFHsiu1w+Yu6GW+uv3sGzIvqNpMFeAhfqSuHQApicDNGb4PR 0RQoG2gMf7fO6hjE9Vh246f4TDCMHx8zv3A75E3A/qXWExmEicGIfwkmy+5Z+djHuf8W oESKc8kDqScm8pKyuOtfllVGKGW4oCTLbQRu/48tmzQ3QQsmnx4WWUc8ZbiNafMGlKxS 6DzQ== 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=b4Cw2U+uVNH0qZjWBcm7fGDr9uwvRVbYPx6aJrDvgVc=; b=d9OqmJw1GnUVYk7ALBKj/b7ete8vFmiwEBRNJRHz3YsJVLidRzFVoklNNY4ngAIj/o dov9Z3t/E+GvDbRQaKAd0w/mk2MX7vgnWZpubNLnZwTqwGcSmgVQ6ePPuIzXGUsQ/xYX iIXNh0NxKruO9yVPXRlKxB8Ozn/esD7ThmypWaHZ26kawqfKJKtwS7ysLoT3RTWhrg5Q 2RQH8VOZ3iLRj1UnpH5Rpcy/k9+PRe1OqXoQ6YmpWbFkeu8VTEGdJuvxN3gs/UPF4H2n ii5I5ORfrvpZUSaR2my1uFUdvCp///QKjX0fjhvPkZu9SGOZBRk/m7fcAneYsCkuSZWC 8SWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VHA8OcDI; 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 c7si3706242ejx.28.2020.04.22.05.19.53; Wed, 22 Apr 2020 05:20:19 -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=VHA8OcDI; 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 S1728701AbgDVKIZ (ORCPT + 99 others); Wed, 22 Apr 2020 06:08:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:33698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbgDVKIW (ORCPT ); Wed, 22 Apr 2020 06:08:22 -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 D92D82076C; Wed, 22 Apr 2020 10:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550101; bh=JmlwPFJCgtHQ5q2BAaJ+MbNuBQYZUDzspX3nzoSpbdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VHA8OcDIqH1v0VqyqX/JwLmUXIkqaNFoklyKONzrdqc7tJQrbkztdLZl4fCK0NVYZ IGq/RNv8tUv14akJdOwySj3EptXQp437lT+1PUfYCoHxx/aQgpCXkGXpwt8J75K8Xz RZfz0UdQSo28TpOVQa1jPPlnNitnoUp5ZIZgJMNk= 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 4.14 002/199] net: vxge: fix wrong __VA_ARGS__ usage Date: Wed, 22 Apr 2020 11:55:28 +0200 Message-Id: <20200422095058.079130235@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095057.806111593@linuxfoundation.org> References: <20200422095057.806111593@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 cfa970417f818..fe4a4315d20d4 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 3a79d93b84453..5b535aa10d23e 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.h +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.h @@ -454,49 +454,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