From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932478AbbDMQHe (ORCPT ); Mon, 13 Apr 2015 12:07:34 -0400 Received: from smtprelay0242.hostedemail.com ([216.40.44.242]:56068 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932380AbbDMQHb (ORCPT ); Mon, 13 Apr 2015 12:07:31 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:355:379:541:800:960:967:968:973:988:989:1260:1263:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1540:1568:1593:1594:1711:1714:1730:1747:1777:1792:2393:2525:2560:2563:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3865:3866:3868:3870:3871:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4419:5007:6261:8599:9025:10004:10400:10848:10913:11026:11473:11658:11914:12043:12296:12517:12519:12555:12679:12783:13069:13161:13221:13229:13311:13357:14094:14096:14394:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: side16_2425061e7bd28 X-Filterd-Recvd-Size: 1791 Date: Mon, 13 Apr 2015 12:07:27 -0400 From: Steven Rostedt To: Greg KH Cc: Stephen Rothwell , Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler Subject: [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define Message-ID: <20150413120727.3bb82df0@gandalf.local.home> In-Reply-To: <20150413104328.GB6390@kroah.com> References: <20150413193720.56083fbf@canb.auug.org.au> <20150413104328.GB6390@kroah.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org TRACE_SYSTEM_STRING is defined in mei-trace.h but is unused. Worse yet, the ftrace tracing infrastructure is using it now and this causes warnings about redefined macros. Remove the define of TRACE_SYSTEM_STRING from mei-trace.h Link: http://lkml.kernel.org/r/20150413193720.56083fbf@canb.auug.org.au Reported-by: Stephen Rothwell Signed-off-by: Steven Rostedt --- diff --git a/drivers/misc/mei/mei-trace.h b/drivers/misc/mei/mei-trace.h index 5f4e1a17360b..c9e24d2b698a 100644 --- a/drivers/misc/mei/mei-trace.h +++ b/drivers/misc/mei/mei-trace.h @@ -26,7 +26,6 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM mei -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) TRACE_EVENT(mei_reg_read, TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val),