lkml.org 
[lkml]   [2008]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] pc300: Update to tty_set_operations
This driver somehow escaped the tty operations changes way back when.
Update it so that we can switch to tty->ops shortly.

Signed-off-by: Alan Cox <alan@redhat.com>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/net/wan/pc300_tty.c linux-2.6.25-rc8-mm2/drivers/net/wan/pc300_tty.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/net/wan/pc300_tty.c 2008-04-13 12:55:52.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/net/wan/pc300_tty.c 2008-04-13 15:41:35.000000000 +0100
@@ -178,6 +178,20 @@
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 @@
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)) {


\
 
 \ /
  Last update: 2008-04-13 19:33    [W:0.030 / U:0.748 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site