[PATCH 0/4] serial: earlycon: keep earlycon symbols for non-module and driver clean-ups

[PATCH 0/4] serial: earlycon: keep earlycon symbols for non-module and driver clean-ups

[Masahiro Yamada]

1/4: keep earlycon symbols only when CONFIG_SERIAL_EARLYCON is defined
     and the driver is built-in.

2/4 thru 4/4: driver clean-ups.
              (partially reverts build fixes by Arnd Bergmann)



Masahiro Yamada (4):
  earlycon: mark earlycon code as __used iif the caller is built-in
  serial: 8250_uniphier: drop !defined(MODULE) conditional
  serial: 8250_mtk: drop !defined(MODULE) conditional
  serial: 8250_ingenic: drop #if conditional surrounding earlycon code

 drivers/tty/serial/8250/8250_ingenic.c  | 2 --
 drivers/tty/serial/8250/8250_mtk.c      | 2 +-
 drivers/tty/serial/8250/8250_uniphier.c | 2 +-
 drivers/tty/serial/8250/Kconfig         | 2 +-
 include/linux/serial_core.h             | 8 +++++++-
 5 files changed, 10 insertions(+), 6 deletions(-)

-- 
1.9.1

[PATCH 2/4] serial: 8250_uniphier: drop !defined(MODULE) conditional

[Masahiro Yamada]

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

[PATCH 3/4] serial: 8250_mtk: drop !defined(MODULE) conditional

[Masahiro Yamada]

The !defined(MODULE) conditional has been added to the
OF_EARLYCON_DECLARE() define.

This commit partially reverts commit 3f5921a60f74 ("serial:
8250/mediatek: fix building with SERIAL_8250=m").

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/tty/serial/8250/8250_mtk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index 3489fbc..3611ec9 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -301,7 +301,7 @@ static struct platform_driver mtk8250_platform_driver = {
 };
 module_platform_driver(mtk8250_platform_driver);
 
-#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE)
+#ifdef CONFIG_SERIAL_8250_CONSOLE
 static int __init early_mtk8250_setup(struct earlycon_device *device,
 					const char *options)
 {
-- 
1.9.1

[PATCH 0/4] serial: earlycon: keep earlycon symbols for non-module and driver clean-ups

[Arnd Bergmann]

On Monday, June 6, 2016 6:40:59 PM CEST Masahiro Yamada wrote:
> 1/4: keep earlycon symbols only when CONFIG_SERIAL_EARLYCON is defined
>      and the driver is built-in.
> 
> 2/4 thru 4/4: driver clean-ups.
>               (partially reverts build fixes by Arnd Bergmann)
> 
> 
> 


Looks good to me,

Acked-by: Arnd Bergmann <arnd@arndb.de>

[PATCH 3/4] serial: 8250_mtk: drop !defined(MODULE) conditional

[Matthias Brugger]

On 06/06/16 11:41, Masahiro Yamada wrote:
> The !defined(MODULE) conditional has been added to the
> OF_EARLYCON_DECLARE() define.
>
> This commit partially reverts commit 3f5921a60f74 ("serial:
> 8250/mediatek: fix building with SERIAL_8250=m").
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

Acked-by: Matthias Brugger <matthias.bgg@gmail.com>

>
>   drivers/tty/serial/8250/8250_mtk.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
> index 3489fbc..3611ec9 100644
> --- a/drivers/tty/serial/8250/8250_mtk.c
> +++ b/drivers/tty/serial/8250/8250_mtk.c
> @@ -301,7 +301,7 @@ static struct platform_driver mtk8250_platform_driver = {
>   };
>   module_platform_driver(mtk8250_platform_driver);
>
> -#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE)
> +#ifdef CONFIG_SERIAL_8250_CONSOLE
>   static int __init early_mtk8250_setup(struct earlycon_device *device,
>   					const char *options)
>   {
>