From patchwork Mon Jun 6 09:41:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9157665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89E0260572 for ; Mon, 6 Jun 2016 09:43:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3858F1FFC9 for ; Mon, 6 Jun 2016 09:43:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CC3A2656B; Mon, 6 Jun 2016 09:43:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA2E41FFC9 for ; Mon, 6 Jun 2016 09:43:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9r24-0005xG-50; Mon, 06 Jun 2016 09:41:16 +0000 Received: from conuserg-07.nifty.com ([210.131.2.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9r21-0005us-5G for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2016 09:41:14 +0000 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id u569e1aH006920; Mon, 6 Jun 2016 18:40:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u569e1aH006920 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465206007; bh=KiTtyU1guBETmp/E0jZGDWrlWQ7+Dnv3MInbjTheCjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gKjJfDQy7/1k5jU1ikyzJ1qDutXv+/ZaRf8dALEJW9JrCLecws4pftBsknvnEF6LO Dh3VOAXXvZRvtLFEaze3VcLvmc0J7kRTIPadd63kjmKCxi81C5AAURvlPzqRLVNFzr t+HfsLBGmWUB/BQomnEzUiVw79lxS5oVqkUoBuDLuhZhIXIsRA1hv/ALTQyZJTeErs sVNwL1jgv4Fq28ZnED5CvECLfXTlUlkK8sn011cCVieAMRt4H9i4xkFSV54r89RfU2 01KkIxulYK68ELvWZDOr/V2EOK0haivy8lwAP/8HyIinZLmAcG8qGlAUr3dZlDK7YD NT4Q7C6y4IIww== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-serial@vger.kernel.org Subject: [PATCH 2/4] serial: 8250_uniphier: drop !defined(MODULE) conditional Date: Mon, 6 Jun 2016 18:41:01 +0900 Message-Id: <1465206063-1018-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465206063-1018-1-git-send-email-yamada.masahiro@socionext.com> References: <1465206063-1018-1-git-send-email-yamada.masahiro@socionext.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160606_024113_423218_3D25B0C6 X-CRM114-Status: UNSURE ( 8.89 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Hurley , Paul Burton , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Masahiro Yamada , Arnd Bergmann , Jiri Slaby , Matthias Brugger , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The !defined(MODULE) conditional has been added to the OF_EARLYCON_DECLARE() define. Now we can revert commit a2d3ea2f2399 ("serial: 8250/uniphier: fix modular build"). Signed-off-by: Masahiro Yamada --- drivers/tty/serial/8250/8250_uniphier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c index efd1f9c..b8d9c8c 100644 --- a/drivers/tty/serial/8250/8250_uniphier.c +++ b/drivers/tty/serial/8250/8250_uniphier.c @@ -35,7 +35,7 @@ struct uniphier8250_priv { spinlock_t atomic_write_lock; }; -#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE) +#ifdef CONFIG_SERIAL_8250_CONSOLE static int __init uniphier_early_console_setup(struct earlycon_device *device, const char *options) {