linux-next: build warnings after merge of the char-misc tree

linux-next: build warnings after merge of the char-misc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

Hi all,

After merging the char-misc tree, today's linux-next build (powerpc
allnoconfig) produced these warnings:

drivers/bus/simple-pm-bus.c:96:12: warning: 'simple_pm_bus_runtime_resume' defined but not used [-Wunused-function]
   96 | static int simple_pm_bus_runtime_resume(struct device *dev)
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/bus/simple-pm-bus.c:87:12: warning: 'simple_pm_bus_runtime_suspend' defined but not used [-Wunused-function]
   87 | static int simple_pm_bus_runtime_suspend(struct device *dev)
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Introduced by commit

  882cf4c913d7 ("drivers: bus: simple-pm-bus: Use clocks")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warnings after merge of the char-misc tree

[Arnd Bergmann]

On Mon, Nov 14, 2022, at 08:17, Stephen Rothwell wrote:
> Hi all,
>
> After merging the char-misc tree, today's linux-next build (powerpc
> allnoconfig) produced these warnings:
>
> drivers/bus/simple-pm-bus.c:96:12: warning: 
> 'simple_pm_bus_runtime_resume' defined but not used [-Wunused-function]
>    96 | static int simple_pm_bus_runtime_resume(struct device *dev)
>       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/bus/simple-pm-bus.c:87:12: warning: 
> 'simple_pm_bus_runtime_suspend' defined but not used [-Wunused-function]
>    87 | static int simple_pm_bus_runtime_suspend(struct device *dev)
>       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Introduced by commit
>
>   882cf4c913d7 ("drivers: bus: simple-pm-bus: Use clocks")

I see that this is caused by the patch using the old-style
SET_RUNTIME_PM_OPS/SET_NOIRQ_SYSTEM_SLEEP_PM_OPS macros
instead of the correct SYSTEM_SLEEP_PM_OPS/NOIRQ_SYSTEM_SLEEP_PM_OPS
versions.

     Arnd

Re: linux-next: build warnings after merge of the char-misc tree

[Greg KH]

On Mon, Nov 14, 2022 at 08:33:41AM +0100, Arnd Bergmann wrote:
> On Mon, Nov 14, 2022, at 08:17, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the char-misc tree, today's linux-next build (powerpc
> > allnoconfig) produced these warnings:
> >
> > drivers/bus/simple-pm-bus.c:96:12: warning: 
> > 'simple_pm_bus_runtime_resume' defined but not used [-Wunused-function]
> >    96 | static int simple_pm_bus_runtime_resume(struct device *dev)
> >       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/bus/simple-pm-bus.c:87:12: warning: 
> > 'simple_pm_bus_runtime_suspend' defined but not used [-Wunused-function]
> >    87 | static int simple_pm_bus_runtime_suspend(struct device *dev)
> >       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > Introduced by commit
> >
> >   882cf4c913d7 ("drivers: bus: simple-pm-bus: Use clocks")
> 
> I see that this is caused by the patch using the old-style
> SET_RUNTIME_PM_OPS/SET_NOIRQ_SYSTEM_SLEEP_PM_OPS macros
> instead of the correct SYSTEM_SLEEP_PM_OPS/NOIRQ_SYSTEM_SLEEP_PM_OPS
> versions.

Ok, will go revert the offending commit for now, thanks!

greg k-h

Re: linux-next: build warnings after merge of the char-misc tree

[Liu Ying]

Hi Arnd,

On Mon, 2022-11-14 at 08:33 +0100, Arnd Bergmann wrote:
> On Mon, Nov 14, 2022, at 08:17, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the char-misc tree, today's linux-next build (powerpc
> > allnoconfig) produced these warnings:
> > 
> > drivers/bus/simple-pm-bus.c:96:12: warning: 
> > 'simple_pm_bus_runtime_resume' defined but not used [-Wunused-function]
> >    96 | static int simple_pm_bus_runtime_resume(struct device *dev)
> >       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/bus/simple-pm-bus.c:87:12: warning: 
> > 'simple_pm_bus_runtime_suspend' defined but not used [-Wunused-function]
> >    87 | static int simple_pm_bus_runtime_suspend(struct device *dev)
> >       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > 
> > Introduced by commit
> > 
> >   882cf4c913d7 ("drivers: bus: simple-pm-bus: Use clocks")
> 
> I see that this is caused by the patch using the old-style
> SET_RUNTIME_PM_OPS/SET_NOIRQ_SYSTEM_SLEEP_PM_OPS macros
> instead of the correct SYSTEM_SLEEP_PM_OPS/NOIRQ_SYSTEM_SLEEP_PM_OPS
> versions.
> 

You meant RUNTIME_PM_OPS/NOIRQ_SYSTEM_SLEEP_PM_OPS macros should be
used, right?

Why not add __maybe_unused to the callbacks like below snippet instead?
This way, the old-style macros may determine those callbacks are NULL
or non-NULL according to CONFIG_PM_SLEEP and CONFIG_PM.
-------------------------------8<-------------------------------------
--- a/drivers/bus/simple-pm-bus.c
+++ b/drivers/bus/simple-pm-bus.c
@@ -84,7 +84,7 @@ static int simple_pm_bus_remove(struct
platform_device *pdev)
        return 0;
 }

-static int simple_pm_bus_runtime_suspend(struct device *dev)
+static int __maybe_unused simple_pm_bus_runtime_suspend(struct device
*dev)
 {
        struct simple_pm_bus *bus = dev_get_drvdata(dev);

@@ -93,7 +93,7 @@ static int simple_pm_bus_runtime_suspend(struct
device *dev)
        return 0;
 }

-static int simple_pm_bus_runtime_resume(struct device *dev)
+static int __maybe_unused simple_pm_bus_runtime_resume(struct device
*dev)
 {
        struct simple_pm_bus *bus = dev_get_drvdata(dev);
        int ret;
-------------------------------8<-------------------------------------

Regards,
Liu Ying

Re: linux-next: build warnings after merge of the char-misc tree

[Arnd Bergmann]

On Mon, Nov 14, 2022, at 10:03, Liu Ying wrote:
> On Mon, 2022-11-14 at 08:33 +0100, Arnd Bergmann wrote:
>> On Mon, Nov 14, 2022, at 08:17, Stephen Rothwell wrote:
>> > Hi all,
>> > 
>> > After merging the char-misc tree, today's linux-next build (powerpc
>> > allnoconfig) produced these warnings:
>> > 
>> > drivers/bus/simple-pm-bus.c:96:12: warning: 
>> > 'simple_pm_bus_runtime_resume' defined but not used [-Wunused-function]
>> >    96 | static int simple_pm_bus_runtime_resume(struct device *dev)
>> >       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> > drivers/bus/simple-pm-bus.c:87:12: warning: 
>> > 'simple_pm_bus_runtime_suspend' defined but not used [-Wunused-function]
>> >    87 | static int simple_pm_bus_runtime_suspend(struct device *dev)
>> >       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> > 
>> > Introduced by commit
>> > 
>> >   882cf4c913d7 ("drivers: bus: simple-pm-bus: Use clocks")
>> 
>> I see that this is caused by the patch using the old-style
>> SET_RUNTIME_PM_OPS/SET_NOIRQ_SYSTEM_SLEEP_PM_OPS macros
>> instead of the correct SYSTEM_SLEEP_PM_OPS/NOIRQ_SYSTEM_SLEEP_PM_OPS
>> versions.
>> 
>
> You meant RUNTIME_PM_OPS/NOIRQ_SYSTEM_SLEEP_PM_OPS macros should be
> used, right?

Right, sorry for mixing up the runtime ones.

> Why not add __maybe_unused to the callbacks like below snippet instead?
> This way, the old-style macros may determine those callbacks are NULL
> or non-NULL according to CONFIG_PM_SLEEP and CONFIG_PM.

That was the old way of doing it before 1a3c7bb08826 ("PM: core: Add
new *_PM_OPS macros, deprecate old ones"), we are slowly moving to
the new ones instead to avoid having to add __maybe_unused annotations.

You may however want to use ".pm = pm_ptr(&simple_pm_bus_pm_ops)" if
you care about the space savings for configurations with CONFIG_PM
disabled.

      Arnd

linux-next: build warnings after merge of the char-misc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 763 bytes --]

Hi all,

After merging the char-misc tree, today's linux-next build (htmldocs)
produced these warnings:

Documentation/fpga/dfl.rst:505: WARNING: Title underline too short.

Location of DFLs on a PCI Device
===========================
Documentation/fpga/dfl.rst:505: WARNING: Title underline too short.

Location of DFLs on a PCI Device
===========================
Documentation/fpga/dfl.rst:523: WARNING: Unexpected indentation.
Documentation/fpga/dfl.rst:523: WARNING: Blank line required after table.
Documentation/fpga/dfl.rst:524: WARNING: Block quote ends without a blank line; unexpected unindent.

Introduced by commit

  fa41d10589be ("fpga: dfl-pci: locate DFLs by PCIe vendor specific capability")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build warnings after merge of the char-misc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3166 bytes --]

Hi all,

After merging the char-misc tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:

In file included from include/trace/define_trace.h:90:0,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
 #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
 ^
In file included from include/trace/define_trace.h:83:0,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
 #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 ^
In file included from include/trace/ftrace.h:134:0,
                 from include/trace/define_trace.h:90,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
 #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 ^
In file included from include/trace/define_trace.h:90:0,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
include/trace/ftrace.h:28:0: note: this is the location of the previous definition
 #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
 ^
In file included from include/trace/define_trace.h:90:0,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
 #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
 ^
In file included from include/trace/define_trace.h:83:0,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
 #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 ^
In file included from include/trace/ftrace.h:134:0,
                 from include/trace/define_trace.h:90,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
 #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 ^
In file included from include/trace/define_trace.h:90:0,
                 from drivers/misc/mei/mei-trace.h:76,
                 from drivers/misc/mei/mei-trace.c:21:
include/trace/ftrace.h:28:0: note: this is the location of the previous definition
 #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
 ^

Introduced by commit a0a927d06d79 ("mei: me: add io register tracing")
interacting with commit acd388fd3af3 ("tracing: Give system name a
pointer") from the ftrace tree.

TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h
as it is not being used anywhere in the mei-trace code.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build warnings after merge of the char-misc tree

[Greg KH]

On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:
> 
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> In file included from include/trace/define_trace.h:83:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/ftrace.h:134:0,
>                  from include/trace/define_trace.h:90,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> In file included from include/trace/define_trace.h:83:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/ftrace.h:134:0,
>                  from include/trace/define_trace.h:90,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> 
> Introduced by commit a0a927d06d79 ("mei: me: add io register tracing")
> interacting with commit acd388fd3af3 ("tracing: Give system name a
> pointer") from the ftrace tree.
> 
> TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h
> as it is not being used anywhere in the mei-trace code.

That's nice for such system-wide changes to be done at the last possible
minute in the development cycle :(

Anyway, someone from the trace subsystem wish to send me a patch for
this?

thanks,

greg k-h

RE: linux-next: build warnings after merge of the char-misc tree

[Winkler, Tomas]

> -----Original Message-----
> From: Greg KH [mailto:greg@kroah.com]
> Sent: Monday, April 13, 2015 13:43
> To: Stephen Rothwell
> Cc: Arnd Bergmann; Steven Rostedt; linux-next@vger.kernel.org; linux-
> kernel@vger.kernel.org; Winkler, Tomas
> Subject: Re: linux-next: build warnings after merge of the char-misc tree
> 
> On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the char-misc tree, today's linux-next build (x86_64
> > allmodconfig) produced these warnings:
> >
> > In file included from include/trace/define_trace.h:90:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
> >  #define TRACE_SYSTEM_STRING
> __app(TRACE_SYSTEM_VAR,__trace_system_name)
> >  ^
> > In file included from include/trace/define_trace.h:83:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous
> definition
> >  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> >  ^
> > In file included from include/trace/ftrace.h:134:0,
> >                  from include/trace/define_trace.h:90,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING"
> redefined
> >  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> >  ^
> > In file included from include/trace/define_trace.h:90:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > include/trace/ftrace.h:28:0: note: this is the location of the previous definition
> >  #define TRACE_SYSTEM_STRING
> __app(TRACE_SYSTEM_VAR,__trace_system_name)
> >  ^
> > In file included from include/trace/define_trace.h:90:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
> >  #define TRACE_SYSTEM_STRING
> __app(TRACE_SYSTEM_VAR,__trace_system_name)
> >  ^
> > In file included from include/trace/define_trace.h:83:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous
> definition
> >  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> >  ^
> > In file included from include/trace/ftrace.h:134:0,
> >                  from include/trace/define_trace.h:90,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING"
> redefined
> >  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> >  ^
> > In file included from include/trace/define_trace.h:90:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > include/trace/ftrace.h:28:0: note: this is the location of the previous definition
> >  #define TRACE_SYSTEM_STRING
> __app(TRACE_SYSTEM_VAR,__trace_system_name)
> >  ^
> >
> > Introduced by commit a0a927d06d79 ("mei: me: add io register tracing")
> > interacting with commit acd388fd3af3 ("tracing: Give system name a
> > pointer") from the ftrace tree.
> >
> > TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-
> trace.h
> > as it is not being used anywhere in the mei-trace code.
> 
> That's nice for such system-wide changes to be done at the last possible
> minute in the development cycle :(
> 
> Anyway, someone from the trace subsystem wish to send me a patch for
> this?
> 
> thanks,
Will send in few
Tomas

Re: linux-next: build warnings after merge of the char-misc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

Hi Greg,

On Mon, 13 Apr 2015 12:43:28 +0200 Greg KH <greg@kroah.com> wrote:
>
> That's nice for such system-wide changes to be done at the last possible
> minute in the development cycle :(

Tell me about it - its 20:46 here and I'm not done yet :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
\

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build warnings after merge of the char-misc tree

[Steven Rostedt]

On Mon, 13 Apr 2015 12:43:28 +0200
Greg KH <greg@kroah.com> wrote:
 ^
> > 
> > Introduced by commit a0a927d06d79 ("mei: me: add io register tracing")
> > interacting with commit acd388fd3af3 ("tracing: Give system name a
> > pointer") from the ftrace tree.
> > 
> > TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h
> > as it is not being used anywhere in the mei-trace code.
> 
> That's nice for such system-wide changes to be done at the last possible
> minute in the development cycle :(

Hmm, sorry. I'll try to figure out what happened. A lot of this was
done earlier, but I was waiting for acks an also making sure it worked,
and doing lots of iterations of testing. Unfortunately, I only tested
against what was in mainline, not what was in linux-next. I should have
done that too.


> 
> Anyway, someone from the trace subsystem wish to send me a patch for
> this?
> 

I'll download latest linux-next and take a look at the carnage. This is
something that may break builds, but is pretty straight forward that
shouldn't cause anything serious to break at run time.

-- Steve

Re: linux-next: build warnings after merge of the char-misc tree

[Steven Rostedt]

On Mon, 13 Apr 2015 12:43:28 +0200
Greg KH <greg@kroah.com> wrote:

> > In file included from include/trace/define_trace.h:90:0,
> >                  from drivers/misc/mei/mei-trace.h:76,
> >                  from drivers/misc/mei/mei-trace.c:21:
> > include/trace/ftrace.h:28:0: note: this is the location of the previous definition
> >  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
> >  ^
> > 
> > Introduced by commit a0a927d06d79 ("mei: me: add io register tracing")
> > interacting with commit acd388fd3af3 ("tracing: Give system name a
> > pointer") from the ftrace tree.
> > 
> > TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h
> > as it is not being used anywhere in the mei-trace code.
> 
> That's nice for such system-wide changes to be done at the last possible
> minute in the development cycle :(
> 

Looking at this deeper, this commit isn't a problem with the trace
system change. It is caused probably by a cut and paste from a driver
that had TRACE_SYSTEM_STRING and should not have. A simple removal of
this define should be enough to fix the issue.

-- Steve

Re: linux-next: build warnings after merge of the char-misc tree

[Greg KH]

On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the char-misc tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:
> 
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> In file included from include/trace/define_trace.h:83:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/ftrace.h:134:0,
>                  from include/trace/define_trace.h:90,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> In file included from include/trace/define_trace.h:83:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/ftrace.h:134:0,
>                  from include/trace/define_trace.h:90,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
>  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
>  ^
> In file included from include/trace/define_trace.h:90:0,
>                  from drivers/misc/mei/mei-trace.h:76,
>                  from drivers/misc/mei/mei-trace.c:21:
> include/trace/ftrace.h:28:0: note: this is the location of the previous definition
>  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
>  ^
> 
> Introduced by commit a0a927d06d79 ("mei: me: add io register tracing")
> interacting with commit acd388fd3af3 ("tracing: Give system name a
> pointer") from the ftrace tree.
> 
> TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h
> as it is not being used anywhere in the mei-trace code.

Now removed, thanks.

greg k-h