diff mbox

sh: sh-sci build failure fix.

Message ID 1447648066-1761-1-git-send-email-ysato@users.sourceforge.jp (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Yoshinori Sato Nov. 16, 2015, 4:27 a.m. UTC
We need little update.

Build failed on CONFIG_SERIAL_EARLYCON=y and CONFIG_SERIAL_SH_SCI=m.
I think it only COMPILE_TEST.

earlycon code depend on CONFIG_SERIAL_SH_SCI_EARLYCON

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 drivers/tty/serial/sh-sci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven Dec. 21, 2015, 3:51 p.m. UTC | #1
Hi Sato-san,

On Mon, Nov 16, 2015 at 5:27 AM, Yoshinori Sato
<ysato@users.sourceforge.jp> wrote:
> We need little update.
>
> Build failed on CONFIG_SERIAL_EARLYCON=y and CONFIG_SERIAL_SH_SCI=m.
> I think it only COMPILE_TEST.
>
> earlycon code depend on CONFIG_SERIAL_SH_SCI_EARLYCON

Thanks!

You forgot to update the third test for CONFIG_SERIAL_EARLYCON.
Without that fixed, I still get:

drivers/tty/serial/sh-sci.c:926:13: warning: 'sci_poll_put_char'
defined but not used [-Wunused-function]
 static void sci_poll_put_char(struct uart_port *port, unsigned char c)
             ^
(ignore the wrong line number)

I'll fix that, squash it into the original commit, and forward to GregKH, now
commit e1dd3bef6d03c908 ("serial: earlycon: Add missing spinlock
initialization") is upstream.

> Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> ---
>  drivers/tty/serial/sh-sci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 39e5358..9078443 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -2412,7 +2412,7 @@ static void sci_cleanup_single(struct sci_port *port)
>         pm_runtime_disable(port->port.dev);
>  }
>
> -#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SERIAL_EARLYCON)
> +#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SERIAL_SH_SCI_EARLYCON)
>  static void serial_console_putchar(struct uart_port *port, int ch)
>  {
>         sci_poll_put_char(port, ch);
> @@ -2793,7 +2793,7 @@ static void __exit sci_exit(void)
>  early_platform_init_buffer("earlyprintk", &sci_driver,
>                            early_serial_buf, ARRAY_SIZE(early_serial_buf));
>  #endif
> -#ifdef CONFIG_SERIAL_EARLYCON
> +#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
>  static struct __init plat_sci_port port_cfg;
>
>  static int __init early_console_setup(struct earlycon_device *device,

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 39e5358..9078443 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2412,7 +2412,7 @@  static void sci_cleanup_single(struct sci_port *port)
 	pm_runtime_disable(port->port.dev);
 }
 
-#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SERIAL_EARLYCON)
+#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SERIAL_SH_SCI_EARLYCON)
 static void serial_console_putchar(struct uart_port *port, int ch)
 {
 	sci_poll_put_char(port, ch);
@@ -2793,7 +2793,7 @@  static void __exit sci_exit(void)
 early_platform_init_buffer("earlyprintk", &sci_driver,
 			   early_serial_buf, ARRAY_SIZE(early_serial_buf));
 #endif
-#ifdef CONFIG_SERIAL_EARLYCON
+#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
 static struct __init plat_sci_port port_cfg;
 
 static int __init early_console_setup(struct earlycon_device *device,