From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932534AbbDMQ4X (ORCPT ); Mon, 13 Apr 2015 12:56:23 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:53409 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932081AbbDMQ4W (ORCPT ); Mon, 13 Apr 2015 12:56:22 -0400 X-Sasl-enc: PG2WCz3GJVt39y7/NSwKVx1rR8vgnvnfTlOipXsFbVqH 1428944181 Date: Mon, 13 Apr 2015 18:56:19 +0200 From: Greg KH To: Steven Rostedt Cc: Stephen Rothwell , Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler Subject: Re: [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define Message-ID: <20150413165619.GB32634@kroah.com> References: <20150413193720.56083fbf@canb.auug.org.au> <20150413104328.GB6390@kroah.com> <20150413120727.3bb82df0@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150413120727.3bb82df0@gandalf.local.home> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 13, 2015 at 12:07:27PM -0400, Steven Rostedt wrote: > 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), This is already in my tree, and will show up in the next linux-next :) thanks, greg k-h