8250: uniphier: allow modular build with 8250 console

arndb · gregkh · commit d56edd7ed0ed · 2016-02-06T23:04:51.000-08:00
The recently added uniphier 8250 port driver supports early console probing, and it supports being built as a module, but the combination of the two fails to link: ERROR: "early_serial8250_setup" [drivers/tty/serial/8250/8250_uniphier.ko] undefined! Given that earlycon support in a loadable module makes no sense, making that code conditional on 'MODULE' is a correct solution. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: b8d20e0 ("serial: 8250_uniphier: add earlycon support") Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git 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;
 };
 
-#ifdef CONFIG_SERIAL_8250_CONSOLE
+#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE)
 static int __init uniphier_early_console_setup(struct earlycon_device *device,
 					       const char *options)
 {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ struct uniphier8250_priv {`
`35`	`35`	`spinlock_t atomic_write_lock;`
`36`	`36`	`};`
`37`	`37`
`38`		`-#ifdef CONFIG_SERIAL_8250_CONSOLE`
	`38`	`+#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE)`
`39`	`39`	`static int __init uniphier_early_console_setup(struct earlycon_device *device,`
`40`	`40`	`const char *options)`
`41`	`41`	`{`