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

Commit 0274b1c9 authored by John Stultz's avatar John Stultz Committed by Rom Lemarchand
Browse files

arm: dcc_tty: fix armv6 dcc tty build failure 



Fix spinlock declaration and tty_insert/flip arguments.

If ARM DCC tty driver is enabled then we run into following build failure:
----------
  CC      drivers/char/dcc_tty.o
drivers/char/dcc_tty.c:29:36: error: ‘SPIN_LOCK_UNLOCKED’ undeclared here (not in a function)
drivers/char/dcc_tty.c: In function ‘dcc_poll_locked’:
drivers/char/dcc_tty.c:83:4: warning: passing argument 1 of ‘tty_insert_flip_string’ from incompatible pointer type [enabled by default]
In file included from drivers/char/dcc_tty.c:23:0:
include/linux/tty_flip.h:32:19: note: expected ‘struct tty_port *’ but argument is of type ‘struct tty_struct *’
drivers/char/dcc_tty.c:84:4: warning: passing argument 1 of ‘tty_flip_buffer_push’ from incompatible pointer type [enabled by default]
In file included from drivers/char/dcc_tty.c:23:0:
include/linux/tty_flip.h:13:13: note: expected ‘struct tty_port *’ but argument is of type ‘struct tty_struct *’
make[2]: *** [drivers/char/dcc_tty.o] Error 1
----------

Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent ad88267d

drivers/char/dcc_tty.c

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ MODULE_DESCRIPTION("DCC TTY Driver"); 
MODULE_LICENSE("GPL");

MODULE_VERSION("1.0");



static spinlock_t g_dcc_tty_lock = SPIN_LOCK_UNLOCKED;

DEFINE_SPINLOCK(g_dcc_tty_lock);

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, &ch, 1);

			tty_flip_buffer_push(g_dcc_tty);

			tty_insert_flip_string(g_dcc_tty->port, &ch, 1);

			tty_flip_buffer_push(g_dcc_tty->port);

		}

	}