Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1684926ybz; Thu, 16 Apr 2020 13:39:30 -0700 (PDT) X-Google-Smtp-Source: APiQypJnyw3dVmJMaASGwr3nKIghxcM4D0jMrAzi4v541mOsNspHFe6gJmFpEviFlM1GPIzI98JS X-Received: by 2002:a50:9f85:: with SMTP id c5mr49392edf.278.1587069570051; Thu, 16 Apr 2020 13:39:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587069570; cv=none; d=google.com; s=arc-20160816; b=ZKpEmFyXQjQrVaFmX6VBfhsnd9mmr6mwo2bW8QNhyDwZQPofp/hWLZCMtZV9LtbBbx 1yciTqEkSXMx7BKqiNpiflzXjI9eJniPVqCNZTsb4AnmVcY9fH2xQuo9s3b0Lc1VqNJs TVoIUkdy1h6Hq0tob9gZJ2fukeg1PdWFbjkfwELaWRRv25CuGz94NzYHwAlv+y3v85MD UnKwENXpPjfdVyPq87jQnwuusm0XP5NHafasVNsJOFGh99NgDvqt1kWBlL3EBMMBGE1o FvYiLVNd1NTEsnS5s9OdE+zptDpmMphqGYm60jCYCS/3VDovgJTA5VY7RgKMKwrZo/Rf gapA== 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=J4sAu72ANvvByPebMYRdGCUtCLCZwzSOUS0RXIaxny2sobIj+UuSOYxB2NwlMpjH0i 3xTMUyY5Hs0lpVRFQ1IsI/E+9XmZ6LSYX/UfdcWuebt3QSEeL6ucbusQR7pfih1q4hG8 cI6K0yWFYzmsmLl4vYrS6e0bpZesgD6bP12IdYl3EJSCwdfB6VovTbBwJCxY1ovzV9es wEYuSiBwTa9RifnWEhzA0QfptETI03TtKM41QoWalxJV7q1HdTJqxmasTfYSLrut8OfQ xfb+m4/YmSEhkwEfLC3IoQghyP4m6928HNJCdxAKqaX8v8HYDtwUa1WJeECWf1XYACJo rbkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Z4PHE1OM; 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 a11si13539105edn.170.2020.04.16.13.39.06; Thu, 16 Apr 2020 13:39:30 -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=Z4PHE1OM; 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 S2442561AbgDPPvs (ORCPT + 99 others); Thu, 16 Apr 2020 11:51:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:44106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896590AbgDPNc4 (ORCPT ); Thu, 16 Apr 2020 09:32:56 -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 6147B22263; Thu, 16 Apr 2020 13:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043929; bh=aJGDApDJxafW+Vlm41KJkKg+iMU290np3OMqekDT3+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4PHE1OMDjaJwIpNhIrWFBcPJa8Fqn1QMev1eGp3LZw4vUZk9b4t0Hh/f8DauYdqf i5U/kANFe4lETa5ASFCP9tBtipdakQ+1WxCXm/PxvdSrXmSo6m4j8UKVKTWusGuanD 0BT8VlAmrMYxVYT4CN4hDMBySpfo4plX/LSP2PIY= 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.5 012/257] net: vxge: fix wrong __VA_ARGS__ usage Date: Thu, 16 Apr 2020 15:21:03 +0200 Message-Id: <20200416131327.383753700@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.891903893@linuxfoundation.org> References: <20200416131325.891903893@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