ALSA: firewire-motu: mark trace helpers as __maybe_unused
diff mbox

Message ID 20170419175158.5607-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann April 19, 2017, 5:51 p.m. UTC
Two functions were introduced for the purpose of tracing but cause warnings
when tracing is disabled:

sound/firewire/motu/amdtp-motu.c:284:13: error: 'copy_message' defined but not used [-Werror=unused-function]
 static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks,
sound/firewire/motu/amdtp-motu.c:271:13: error: 'copy_sph' defined but not used [-Werror=unused-function]
 static void copy_sph(u32 *frames, __be32 *buffer, unsigned int data_blocks,

Marking them as __maybe_unused will do the right thing here.

Fixes: 17909c1b3058 ("ALSA: firewire-motu: add tracepoints for SPH in IEC 61883-1 fashion")
Fixes: c6b0b9e65f09 ("ALSA: firewire-motu: add tracepoints for messages for unique protocol")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/firewire/motu/amdtp-motu.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Takashi Iwai April 20, 2017, 10:51 a.m. UTC | #1
On Wed, 19 Apr 2017 19:51:29 +0200,
Arnd Bergmann wrote:
> 
> Two functions were introduced for the purpose of tracing but cause warnings
> when tracing is disabled:
> 
> sound/firewire/motu/amdtp-motu.c:284:13: error: 'copy_message' defined but not used [-Werror=unused-function]
>  static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks,
> sound/firewire/motu/amdtp-motu.c:271:13: error: 'copy_sph' defined but not used [-Werror=unused-function]
>  static void copy_sph(u32 *frames, __be32 *buffer, unsigned int data_blocks,
> 
> Marking them as __maybe_unused will do the right thing here.
> 
> Fixes: 17909c1b3058 ("ALSA: firewire-motu: add tracepoints for SPH in IEC 61883-1 fashion")
> Fixes: c6b0b9e65f09 ("ALSA: firewire-motu: add tracepoints for messages for unique protocol")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied, thanks.


Takashi
Takashi Sakamoto April 20, 2017, 12:52 p.m. UTC | #2
Hi,

On 2017年04月20日 19:51, Takashi Iwai wrote:
> On Wed, 19 Apr 2017 19:51:29 +0200,
> Arnd Bergmann wrote:
>>
>> Two functions were introduced for the purpose of tracing but cause warnings
>> when tracing is disabled:
>>
>> sound/firewire/motu/amdtp-motu.c:284:13: error: 'copy_message' defined but not used [-Werror=unused-function]
>>  static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks,
>> sound/firewire/motu/amdtp-motu.c:271:13: error: 'copy_sph' defined but not used [-Werror=unused-function]
>>  static void copy_sph(u32 *frames, __be32 *buffer, unsigned int data_blocks,
>>
>> Marking them as __maybe_unused will do the right thing here.
>>
>> Fixes: 17909c1b3058 ("ALSA: firewire-motu: add tracepoints for SPH in IEC 61883-1 fashion")
>> Fixes: c6b0b9e65f09 ("ALSA: firewire-motu: add tracepoints for messages for unique protocol")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Applied, thanks.

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

I note that Documentation/process/coding-style.rst describes:
'If you have a function or variable which may potentially go unused in a
particular configuration, and the compiler would warn about its 
definition going unused, mark the definition as __maybe_unused rather 
than wrapping it in a preprocessor conditional.'

Iwa-san, could I request you to apply below patch in the last week of 
this development period?
http://mailman.alsa-project.org/pipermail/alsa-devel/2017-April/119806.html


Regards

Takashi Sakamoto
Takashi Iwai April 20, 2017, 1:01 p.m. UTC | #3
On Thu, 20 Apr 2017 14:52:13 +0200,
Takashi Sakamoto wrote:
> 
> Hi,
> 
> On 2017年04月20日 19:51, Takashi Iwai wrote:
> > On Wed, 19 Apr 2017 19:51:29 +0200,
> > Arnd Bergmann wrote:
> >>
> >> Two functions were introduced for the purpose of tracing but cause warnings
> >> when tracing is disabled:
> >>
> >> sound/firewire/motu/amdtp-motu.c:284:13: error: 'copy_message' defined but not used [-Werror=unused-function]
> >>  static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks,
> >> sound/firewire/motu/amdtp-motu.c:271:13: error: 'copy_sph' defined but not used [-Werror=unused-function]
> >>  static void copy_sph(u32 *frames, __be32 *buffer, unsigned int data_blocks,
> >>
> >> Marking them as __maybe_unused will do the right thing here.
> >>
> >> Fixes: 17909c1b3058 ("ALSA: firewire-motu: add tracepoints for SPH in IEC 61883-1 fashion")
> >> Fixes: c6b0b9e65f09 ("ALSA: firewire-motu: add tracepoints for messages for unique protocol")
> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
> > Applied, thanks.
> 
> Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> 
> I note that Documentation/process/coding-style.rst describes:
> 'If you have a function or variable which may potentially go unused in a
> particular configuration, and the compiler would warn about its
> definition going unused, mark the definition as __maybe_unused rather
> than wrapping it in a preprocessor conditional.'
> 
> Iwa-san, could I request you to apply below patch in the last week of
> this development period?
> http://mailman.alsa-project.org/pipermail/alsa-devel/2017-April/119806.html

Merged now, sorry for overlooking it.


thanks,

Takashi

Patch
diff mbox

diff --git a/sound/firewire/motu/amdtp-motu.c b/sound/firewire/motu/amdtp-motu.c
index 996b5f818918..96f0091144bb 100644
--- a/sound/firewire/motu/amdtp-motu.c
+++ b/sound/firewire/motu/amdtp-motu.c
@@ -268,8 +268,9 @@  static void read_midi_messages(struct amdtp_stream *s, __be32 *buffer,
 }
 
 /* For tracepoints. */
-static void copy_sph(u32 *frames, __be32 *buffer, unsigned int data_blocks,
-		     unsigned int data_block_quadlets)
+static void __maybe_unused copy_sph(u32 *frames, __be32 *buffer,
+				    unsigned int data_blocks,
+				    unsigned int data_block_quadlets)
 {
 	unsigned int i;
 
@@ -281,8 +282,9 @@  static void copy_sph(u32 *frames, __be32 *buffer, unsigned int data_blocks,
 }
 
 /* For tracepoints. */
-static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks,
-			 unsigned int data_block_quadlets)
+static void __maybe_unused copy_message(u64 *frames, __be32 *buffer,
+					unsigned int data_blocks,
+					unsigned int data_block_quadlets)
 {
 	unsigned int i;