Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1340698 > unrolled thread

[PATCH] ARM: sa1100: make sa1100_register_uart_fns a function

Back to article view | Back to linux.kernel

Contents

  [PATCH] ARM: sa1100: make sa1100_register_uart_fns a function Arnd Bergmann <arnd@arndb.de> - 2016-02-23 15:40 +0100
    Re: [PATCH] ARM: sa1100: make sa1100_register_uart_fns a function Linus Walleij <linus.walleij@linaro.org> - 2016-02-25 14:20 +0100
      Re: [PATCH] ARM: sa1100: make sa1100_register_uart_fns a function Arnd Bergmann <arnd@arndb.de> - 2016-02-25 15:40 +0100

#1340698 — [PATCH] ARM: sa1100: make sa1100_register_uart_fns a function

Calling sa1100_register_uart_fns() leaves the port structure
unused when CONFIG_SERIAL_SA1100 is disabled, and we get a
compiler warning about that:

arch/arm/mach-sa1100/badge4.c:317:31: warning: 'badge4_port_fns' defined but not used [-Wunused-variable]
 static struct sa1100_port_fns badge4_port_fns __initdata = {

This turns the two empty macros into empty inline functions,
which has the same effect, but lets the compiler know that the
variables are intentionally unused.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/platform_data/sa11x0-serial.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/linux/platform_data/sa11x0-serial.h b/include/linux/platform_data/sa11x0-serial.h
index 4504d5d592f0..009e1d83fe39 100644
--- a/include/linux/platform_data/sa11x0-serial.h
+++ b/include/linux/platform_data/sa11x0-serial.h
@@ -26,8 +26,12 @@ struct sa1100_port_fns {
 void sa1100_register_uart_fns(struct sa1100_port_fns *fns);
 void sa1100_register_uart(int idx, int port);
 #else
-#define sa1100_register_uart_fns(fns) do { } while (0)
-#define sa1100_register_uart(idx,port) do { } while (0)
+static inline void sa1100_register_uart_fns(struct sa1100_port_fns *fns)
+{
+}
+static inline void sa1100_register_uart(int idx, int port)
+{
+}
 #endif
 
 #endif
-- 
2.7.0

[toc] | [next] | [standalone]

#1343155

On Tue, Feb 23, 2016 at 3:34 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> Calling sa1100_register_uart_fns() leaves the port structure
> unused when CONFIG_SERIAL_SA1100 is disabled, and we get a
> compiler warning about that:
>
> arch/arm/mach-sa1100/badge4.c:317:31: warning: 'badge4_port_fns' defined but not used [-Wunused-variable]
>  static struct sa1100_port_fns badge4_port_fns __initdata = {
>
> This turns the two empty macros into empty inline functions,
> which has the same effect, but lets the compiler know that the
> variables are intentionally unused.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

>  include/linux/platform_data/sa11x0-serial.h | 8 ++++++--

It looks like you should send this to Greg?

Yours,
Linus Walleij

[toc] | [prev] | [next] | [standalone]

#1343208

On Thursday 25 February 2016 14:18:44 Linus Walleij wrote:
> On Tue, Feb 23, 2016 at 3:34 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 
> > Calling sa1100_register_uart_fns() leaves the port structure
> > unused when CONFIG_SERIAL_SA1100 is disabled, and we get a
> > compiler warning about that:
> >
> > arch/arm/mach-sa1100/badge4.c:317:31: warning: 'badge4_port_fns' defined but not used [-Wunused-variable]
> >  static struct sa1100_port_fns badge4_port_fns __initdata = {
> >
> > This turns the two empty macros into empty inline functions,
> > which has the same effect, but lets the compiler know that the
> > variables are intentionally unused.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> >  include/linux/platform_data/sa11x0-serial.h | 8 ++++++--
> 
> It looks like you should send this to Greg?

Yes, good point.

The file was traditionally under arch/arm (or include/asm-arm before
that), but considering it as part of the driver makes slightly
more sense now.

Sent out with a modified subject and your Ack to Greg now.

	Arnd

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web