Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84f57d9e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

tty: serial/samsung: fix modular build 



There are a few bugs in the samsung serial driver when built as a
loadable module, which makes the console code unavailable, as well as
giving no access to the 'printascii' early debug function. This adds
the appropriate compile time conditionals.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ee51f01

drivers/tty/serial/samsung.c

+2 −2
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ console_initcall(s3c24xx_serial_console_init); 
#define S3C24XX_SERIAL_CONSOLE NULL

#endif



#ifdef CONFIG_CONSOLE_POLL

#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_CONSOLE_POLL)

static int s3c24xx_serial_get_poll_char(struct uart_port *port);

static void s3c24xx_serial_put_poll_char(struct uart_port *port,

			 unsigned char c);
@@ -922,7 +922,7 @@ static struct uart_ops s3c24xx_serial_ops = { 
	.request_port	= s3c24xx_serial_request_port,

	.config_port	= s3c24xx_serial_config_port,

	.verify_port	= s3c24xx_serial_verify_port,

#ifdef CONFIG_CONSOLE_POLL

#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_CONSOLE_POLL)

	.poll_get_char = s3c24xx_serial_get_poll_char,

	.poll_put_char = s3c24xx_serial_put_poll_char,

#endif

drivers/tty/serial/samsung.h

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ struct s3c24xx_uart_port { 
#define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg))

#define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg))



#ifdef CONFIG_SERIAL_SAMSUNG_DEBUG

#if defined(CONFIG_SERIAL_SAMSUNG_DEBUG) && \

    defined(CONFIG_DEBUG_LL) && \

    !defined(MODULE)



extern void printascii(const char *);