Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2a6ead...
Commit: 2a6eadbd5a2ae8f458e421f3614f1ad13c0f9a1c
Parent: 36c621d82b956ff6ff72273f848af53e6c581aba
Author: Alan Cox <alan@redhat.com>
AuthorDate: Fri Jan 2 13:46:18 2009 +0000
Committer: Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Fri Jan 2 10:19:39 2009 -0800
tty: Rework istallion to use the tty port changes
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
drivers/char/istallion.c | 159 ++++++++++++---------------------------------
include/linux/istallion.h | 1 -
2 files changed, 43 insertions(+), 117 deletions(-)
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index c4682f9..4c69ab9 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -626,8 +626,6 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp);
static int stli_initopen(struct tty_struct *tty, struct stlibrd *brdp, struct stliport *portp);
static int stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
static int stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
-static int stli_waitcarrier(struct tty_struct *tty, struct stlibrd *brdp,
- struct stliport *portp, struct file *filp);
static int stli_setport(struct tty_struct *tty);
static int stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
static void stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
@@ -787,6 +785,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
{
struct stlibrd *brdp;
struct stliport *portp;
+ struct tty_port *port;
unsigned int minordev, brdnr, portnr;
int rc;
@@ -808,30 +807,19 @@ static int stli_open(struct ...