From 9386f16a900b48ccfbf7eb4fee02dc3edbd9a88c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:54:10 -0700 Subject: [PATCH] --- yaml --- r: 95231 b: refs/heads/master c: 56dbbb9a5704f665068778d4d2c1bdf757756e60 h: refs/heads/master i: 95229: 30327329ddad25e50838e186b8aaca54080b4e3f 95227: 2e79544962fb1e47a0b4632842e4e3b91bd3136f 95223: 24607699e8f96ec3a8b0420a0bda6e44c3014243 95215: f7a56a73550ecf235fbf417c5110f134bca45261 95199: fdbfb754f5d7b3d453d23965f152cd6c6ed84307 95167: 513ef8448b7a9e469e1186f944439e216b60af66 95103: 160846eac1f86c9cdc2c362b7112cb7fd26f7aab 94975: fc5b720abec6e0a9dcff3c84fe5410c23aa7fe63 94719: 0d82d2f56c1770bbad618f034ce468ea06497a17 94207: c5beeabf1e36c002a59c817f801d9e5812be8a2e v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/pc300_tty.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 8fab18c0e5b2..3e66b9c788ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e8e88ca053150efdbecb45d8f481cf560ec808d +refs/heads/master: 56dbbb9a5704f665068778d4d2c1bdf757756e60 diff --git a/trunk/drivers/net/wan/pc300_tty.c b/trunk/drivers/net/wan/pc300_tty.c index 63abfd72542d..e03eef2f2282 100644 --- a/trunk/drivers/net/wan/pc300_tty.c +++ b/trunk/drivers/net/wan/pc300_tty.c @@ -178,6 +178,20 @@ static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char signal) CPC_TTY_UNLOCK(card,flags); } + +static const struct tty_operations pc300_ops = { + .open = cpc_tty_open, + .close = cpc_tty_close, + .write = cpc_tty_write, + .write_room = cpc_tty_write_room, + .chars_in_buffer = cpc_tty_chars_in_buffer, + .tiocmset = pc300_tiocmset, + .tiocmget = pc300_tiocmget, + .flush_buffer = cpc_tty_flush_buffer, + .hangup = cpc_tty_hangup, +}; + + /* * PC300 TTY initialization routine * @@ -225,15 +239,7 @@ void cpc_tty_init(pc300dev_t *pc300dev) serial_drv.flags = TTY_DRIVER_REAL_RAW; /* interface routines from the upper tty layer to the tty driver */ - serial_drv.open = cpc_tty_open; - serial_drv.close = cpc_tty_close; - serial_drv.write = cpc_tty_write; - serial_drv.write_room = cpc_tty_write_room; - serial_drv.chars_in_buffer = cpc_tty_chars_in_buffer; - serial_drv.tiocmset = pc300_tiocmset; - serial_drv.tiocmget = pc300_tiocmget; - serial_drv.flush_buffer = cpc_tty_flush_buffer; - serial_drv.hangup = cpc_tty_hangup; + tty_set_operations(&serial_drv, &pc300_ops); /* register the TTY driver */ if (tty_register_driver(&serial_drv)) {