From dbe3b633a70b928e8f7ca92c9eb6751ea4bd71bc Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 26 May 2016 12:57:56 +0530 Subject: [PATCH] Revert "arm: dcc_tty: fix armv6 dcc tty build failure" This reverts commit dfc1d4be88597141f5ad9d39908c13944d209009. Drop AOSP's "armv6 dcc tty driver" in favor of upstream DCC driver for ARMv6/v7 16c63f8ea49c (drivers: char: hvc: add arm JTAG DCC console support) and for ARMv8 4cad4c57e0b3 (ARM64: TTY: hvc_dcc: Add support for ARM64 dcc). Change-Id: I8110a4fd649b8ac1ec9bfac00255c1214135e4b2 Signed-off-by: Amit Pundir --- drivers/char/dcc_tty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/dcc_tty.c b/drivers/char/dcc_tty.c index 0a62d410286f..a787accdcb14 100644 --- a/drivers/char/dcc_tty.c +++ b/drivers/char/dcc_tty.c @@ -26,7 +26,7 @@ MODULE_DESCRIPTION("DCC TTY Driver"); MODULE_LICENSE("GPL"); MODULE_VERSION("1.0"); -DEFINE_SPINLOCK(g_dcc_tty_lock); +static spinlock_t g_dcc_tty_lock = SPIN_LOCK_UNLOCKED; static struct hrtimer g_dcc_timer; static char g_dcc_buffer[16]; static int g_dcc_buffer_head; @@ -80,8 +80,8 @@ static void dcc_poll_locked(void) ); if (rch >= 0) { ch = rch; - tty_insert_flip_string(g_dcc_tty->port, &ch, 1); - tty_flip_buffer_push(g_dcc_tty->port); + tty_insert_flip_string(g_dcc_tty, &ch, 1); + tty_flip_buffer_push(g_dcc_tty); } } -- 2.20.1