From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-serial@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Peter Hurley <peter@hurleysoftware.com>,
Rob Herring <robh@kernel.org>,
Paul Burton <paul.burton@imgtec.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Jiri Slaby <jslaby@suse.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] serial: 8250_uniphier: drop !defined(MODULE) conditional
Date: Mon, 6 Jun 2016 18:41:01 +0900 [thread overview]
Message-ID: <1465206063-1018-3-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1465206063-1018-1-git-send-email-yamada.masahiro@socionext.com>
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 <yamada.masahiro@socionext.com>
---
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)
{
--
1.9.1
next prev parent reply other threads:[~2016-06-06 9:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 9:40 [PATCH 0/4] serial: earlycon: keep earlycon symbols for non-module and driver clean-ups Masahiro Yamada
2016-06-06 9:41 ` [PATCH 1/4] earlycon: mark earlycon code as __used iif the caller is built-in Masahiro Yamada
2016-06-06 9:41 ` Masahiro Yamada [this message]
2016-06-06 9:41 ` [PATCH 3/4] serial: 8250_mtk: drop !defined(MODULE) conditional Masahiro Yamada
2016-06-06 10:27 ` Matthias Brugger
2016-06-06 9:41 ` [PATCH 4/4] serial: 8250_ingenic: drop #if conditional surrounding earlycon code Masahiro Yamada
2016-06-06 10:25 ` [PATCH 0/4] serial: earlycon: keep earlycon symbols for non-module and driver clean-ups Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465206063-1018-3-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=paul.burton@imgtec.com \
--cc=peter@hurleysoftware.com \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®