From patchwork Tue Dec 22 06:42:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 7902171 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0382BBEEED for ; Tue, 22 Dec 2015 07:02:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CF9B205BB for ; Tue, 22 Dec 2015 07:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF6E22053E for ; Tue, 22 Dec 2015 07:02:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752132AbbLVHCM (ORCPT ); Tue, 22 Dec 2015 02:02:12 -0500 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:11015 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752130AbbLVHCL (ORCPT ); Tue, 22 Dec 2015 02:02:11 -0500 X-Greylist: delayed 1152 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Dec 2015 02:02:11 EST Received: from sa76r4 (y081184.ppp.asahi-net.or.jp [118.243.81.184]) by mail1.asahi-net.or.jp (Postfix) with ESMTP id E934324679; Tue, 22 Dec 2015 15:42:57 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id D0AFC10AB0; Tue, 22 Dec 2015 15:42:57 +0900 (JST) X-Virus-Scanned: Debian amavisd-new at sa76r4.localdomain Received: from sa76r4 ([127.0.0.1]) by localhost (sa76r4.localdomain [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IjZC0v-aB8Sv; Tue, 22 Dec 2015 15:42:57 +0900 (JST) Received: from sa76r4.ysato.dip.jp (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id AAE1310422; Tue, 22 Dec 2015 15:42:57 +0900 (JST) Date: Tue, 22 Dec 2015 15:42:57 +0900 Message-ID: <87bn9jt24u.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Geert Uytterhoeven Cc: Ulrich Hecht , Linux-sh list Subject: Re: [PATCH] sh: sh-sci build failure fix. In-Reply-To: References: <1447431743-16376-2-git-send-email-ulrich.hecht+renesas@gmail.com> <1447648066-1761-1-git-send-email-ysato@users.sourceforge.jp> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/24.5 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 22 Dec 2015 00:51:24 +0900, Geert Uytterhoeven wrote: > > Hi Sato-san, > > On Mon, Nov 16, 2015 at 5:27 AM, Yoshinori Sato > 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. OK. Please try this patch. Signed-off-by: Yoshinori Sato > > Signed-off-by: Yoshinori Sato > > --- > > 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 diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 9078443..51ee286 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -581,7 +581,7 @@ static void sci_clear_SCxSR(struct uart_port *port, unsigned int mask) } #if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_SH_SCI_CONSOLE) \ - || defined(CONFIG_SERIAL_EARLYCON) + || defined(CONFIG_SERIAL_SH_SCI_EARLYCON) #ifdef CONFIG_CONSOLE_POLL static int sci_poll_get_char(struct uart_port *port) @@ -622,7 +622,8 @@ static void sci_poll_put_char(struct uart_port *port, unsigned char c) serial_port_out(port, SCxTDR, c); sci_clear_SCxSR(port, SCxSR_TDxE_CLEAR(port) & ~SCxSR_TEND(port)); } -#endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE */ +#endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE + || CONFIG_SERIAL_SH_SCI_EARLYCON_*/ static void sci_init_pins(struct uart_port *port, unsigned int cflag) {