From patchwork Mon Oct 31 21:45:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 122966 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0DD3AB6F9F for ; Tue, 1 Nov 2011 08:45:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932307Ab1JaVpc (ORCPT ); Mon, 31 Oct 2011 17:45:32 -0400 Received: from perches-mx.perches.com ([206.117.179.246]:34398 "EHLO labridge.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753166Ab1JaVpb (ORCPT ); Mon, 31 Oct 2011 17:45:31 -0400 Received: from [81.214.109.6] (account joe@perches.com HELO [192.168.3.39]) by labridge.com (CommuniGate Pro SMTP 5.0.14) with ESMTPA id 18338929; Mon, 31 Oct 2011 14:45:30 -0700 Message-ID: <1320097524.4399.8.camel@Joe-Laptop> Subject: [PATCH] 3c505: Fix compile breakage From: Joe Perches To: Boaz Harrosh , Jason Baron Cc: Philip Blundell , linux-kernel , netdev@vger.kernel.org, Randy Dunlap , Stephen Rothwell Date: Mon, 31 Oct 2011 23:45:24 +0200 In-Reply-To: <4EAF0F34.4070702@panasas.com> References: <4EAF0F34.4070702@panasas.com> X-Mailer: Evolution 3.2.1- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The joys of preprocessor games with c90 named initializers. commit 07613b0b5ef8 ("dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions") uses a ".filename" named initializer. When filename is also a #define this fails to compile. Remove #define filename from 3c505.c Signed-off-by: Joe Perches --- On Mon, 2011-10-31 at 14:12 -0700, Boaz Harrosh wrote: > Doing an "make ARCH=i386 allmodconfig" on linus/master [f362f98] gives me the below > compilation breakage. > (Fedora_15_amd64 machine) > It's probably old news but I thought I'll report it as part of my obligation > as a Kernel monkey Thanks Boaz. Good monkey, drivers/net/ethernet/i825xx/3c505.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c index 40e1a17..ba82a26 100644 --- a/drivers/net/ethernet/i825xx/3c505.c +++ b/drivers/net/ethernet/i825xx/3c505.c @@ -126,15 +126,13 @@ * *********************************************************/ -#define filename __FILE__ - #define timeout_msg "*** timeout at %s:%s (line %d) ***\n" #define TIMEOUT_MSG(lineno) \ - pr_notice(timeout_msg, filename, __func__, (lineno)) + pr_notice(timeout_msg, __FILE__, __func__, (lineno)) #define invalid_pcb_msg "*** invalid pcb length %d at %s:%s (line %d) ***\n" #define INVALID_PCB_MSG(len) \ - pr_notice(invalid_pcb_msg, (len), filename, __func__, __LINE__) + pr_notice(invalid_pcb_msg, (len), __FILE__, __func__, __LINE__) #define search_msg "%s: Looking for 3c505 adapter at address %#x..."