diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-05-26 12:57:56 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-06-16 13:44:10 +0530 |
| commit | e4d3d42ae0204138a7e30dfd283d417b66501d65 (patch) | |
| tree | f4cf51963fdc2b1f616858b338048e639923663e /drivers/char | |
| parent | a3e349430fc8a410962068d86f1916b3e25ef8fe (diff) | |
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 <amit.pundir@linaro.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/dcc_tty.c | 6 |
1 files 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); } } |