summaryrefslogtreecommitdiffstats
path: root/drivers/char/epca.c
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2009-01-02 13:48:17 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-02 10:19:41 -0800
commitc1314a49d7907b96d72f2c41f8927fc3c738e956 (patch)
treee19a5127804c871088d57978f8eba00cf9d3c578 /drivers/char/epca.c
parent6ed1dbaeadd62a026a93aa3ac8680d2dfe9f96b3 (diff)
tty: Redo the rocket driver locking
Bring this driver into the port locking model Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/epca.c')
-rw-r--r--drivers/char/epca.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 71225d1af9e..39ad820b235 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -164,8 +164,6 @@ static int pc_write_room(struct tty_struct *);
static int pc_chars_in_buffer(struct tty_struct *);
static void pc_flush_buffer(struct tty_struct *);
static void pc_flush_chars(struct tty_struct *);
-static int block_til_ready(struct tty_struct *, struct file *,
- struct channel *);
static int pc_open(struct tty_struct *, struct file *);
static void post_fep_init(unsigned int crd);
static void epcapoll(unsigned long);
@@ -422,7 +420,6 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
{
struct channel *ch;
struct tty_port *port;
- unsigned long flags;
/*
* verifyChannel returns the channel from the tty struct if it is
* valid. This serves as a sanity check.
@@ -491,8 +488,6 @@ static void pc_hangup(struct tty_struct *tty)
*/
ch = verifyChannel(tty);
if (ch != NULL) {
- unsigned long flags;
-
pc_flush_buffer(tty);
tty_ldisc_flush(tty);
shutdown(ch, tty);
@@ -750,7 +745,7 @@ static int epca_carrier_raised(struct tty_port *port)
return 0;
}
-static void epca_raise_dtr_rts(struct tty_port *port0
+static void epca_raise_dtr_rts(struct tty_port *port)
{
}
@@ -1268,7 +1263,7 @@ static void post_fep_init(unsigned int crd)
u16 tseg, rseg;
tty_port_init(&ch->port);
- ch->port.ops - &epca_port_ops;
+ ch->port.ops = &epca_port_ops;
ch->brdchan = bc;
ch->mailbox = gd;
INIT_WORK(&ch->tqueue, do_softint);