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>,
Matt Redfearn <matt.redfearn@imgtec.com>,
Jiri Slaby <jslaby@suse.com>,
linux-kernel@vger.kernel.org,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Anton Wuerfel <anton.wuerfel@fau.de>,
Scott Wood <scottwood@freescale.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Martin Sperl <kernel@martin.sperl.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Mathieu OTHACEHE <m.othacehe@gmail.com>,
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
Mans Rullgard <mans@mansr.com>
Subject: [PATCH 4/4] serial: 8250_ingenic: drop #if conditional surrounding earlycon code
Date: Mon, 6 Jun 2016 18:41:03 +0900 [thread overview]
Message-ID: <1465206063-1018-5-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1465206063-1018-1-git-send-email-yamada.masahiro@socionext.com>
The #if defined(CONFIG_SERIAL_EARLYCON) && !defined(MODULE)
conditional has been added to the OF_EARLYCON_DECLARE() define.
The same conditional can be dropped from 8250_ingenic.c because
the unused symbols will be marked as __maybe_unsed.
Also, the Kconfig dependency can become much simpler.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/tty/serial/8250/8250_ingenic.c | 2 --
drivers/tty/serial/8250/Kconfig | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
index b0677f6..4d9dc10 100644
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -48,7 +48,6 @@ static const struct of_device_id of_match[];
#define UART_MCR_MDCE BIT(7)
#define UART_MCR_FCM BIT(6)
-#if defined(CONFIG_SERIAL_EARLYCON) && !defined(MODULE)
static struct earlycon_device *early_device;
static uint8_t __init early_in(struct uart_port *port, int offset)
@@ -141,7 +140,6 @@ OF_EARLYCON_DECLARE(jz4775_uart, "ingenic,jz4775-uart",
EARLYCON_DECLARE(jz4780_uart, ingenic_early_console_setup);
OF_EARLYCON_DECLARE(jz4780_uart, "ingenic,jz4780-uart",
ingenic_early_console_setup);
-#endif /* CONFIG_SERIAL_EARLYCON */
static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)
{
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index b5a0f2e..7c6f7af 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -396,7 +396,7 @@ config SERIAL_8250_UNIPHIER
config SERIAL_8250_INGENIC
tristate "Support for Ingenic SoC serial ports"
depends on SERIAL_8250
- depends on (OF_FLATTREE && SERIAL_8250_CONSOLE) || !SERIAL_EARLYCON
+ depends on OF_FLATTREE
depends on MIPS || COMPILE_TEST
help
If you have a system using an Ingenic SoC and wish to make use of
--
1.9.1
next prev parent reply other threads:[~2016-06-06 9:42 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 ` [PATCH 2/4] serial: 8250_uniphier: drop !defined(MODULE) conditional Masahiro Yamada
2016-06-06 9:41 ` [PATCH 3/4] serial: 8250_mtk: " Masahiro Yamada
2016-06-06 10:27 ` Matthias Brugger
2016-06-06 9:41 ` Masahiro Yamada [this message]
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-5-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=anton.wuerfel@fau.de \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jslaby@suse.com \
--cc=kernel@martin.sperl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=m.othacehe@gmail.com \
--cc=mans@mansr.com \
--cc=matt.redfearn@imgtec.com \
--cc=matthias.bgg@gmail.com \
--cc=paul.burton@imgtec.com \
--cc=paul.gortmaker@windriver.com \
--cc=peter@hurleysoftware.com \
--cc=ricardo.ribalda@gmail.com \
--cc=robh@kernel.org \
--cc=scottwood@freescale.com \
/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®