aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/omninet.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/omninet.c')
-rw-r--r--drivers/usb/serial/omninet.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 7b7422f49478..5a2d045562f0 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -61,12 +61,12 @@ static int debug;
61#define BT_IGNITIONPRO_ID 0x2000 /* This one seems to be a re-branded ZyXEL device */ 61#define BT_IGNITIONPRO_ID 0x2000 /* This one seems to be a re-branded ZyXEL device */
62 62
63/* function prototypes */ 63/* function prototypes */
64static int omninet_open (struct usb_serial_port *port, struct file *filp); 64static int omninet_open (struct tty_struct *tty, struct usb_serial_port *port, struct file *filp);
65static void omninet_close (struct usb_serial_port *port, struct file *filp); 65static void omninet_close (struct tty_struct *tty, struct usb_serial_port *port, struct file *filp);
66static void omninet_read_bulk_callback (struct urb *urb); 66static void omninet_read_bulk_callback (struct urb *urb);
67static void omninet_write_bulk_callback (struct urb *urb); 67static void omninet_write_bulk_callback (struct urb *urb);
68static int omninet_write (struct usb_serial_port *port, const unsigned char *buf, int count); 68static int omninet_write (struct tty_struct *tty, struct usb_serial_port *port, const unsigned char *buf, int count);
69static int omninet_write_room (struct usb_serial_port *port); 69static int omninet_write_room (struct tty_struct *tty);
70static void omninet_shutdown (struct usb_serial *serial); 70static void omninet_shutdown (struct usb_serial *serial);
71static int omninet_attach (struct usb_serial *serial); 71static int omninet_attach (struct usb_serial *serial);
72 72
@@ -157,7 +157,8 @@ static int omninet_attach (struct usb_serial *serial)
157 return 0; 157 return 0;
158} 158}
159 159
160static int omninet_open (struct usb_serial_port *port, struct file *filp) 160static int omninet_open(struct tty_struct *tty,
161 struct usb_serial_port *port, struct file *filp)
161{ 162{
162 struct usb_serial *serial = port->serial; 163 struct usb_serial *serial = port->serial;
163 struct usb_serial_port *wport; 164 struct usb_serial_port *wport;
@@ -166,7 +167,7 @@ static int omninet_open (struct usb_serial_port *port, struct file *filp)
166 dbg("%s - port %d", __func__, port->number); 167 dbg("%s - port %d", __func__, port->number);
167 168
168 wport = serial->port[1]; 169 wport = serial->port[1];
169 wport->tty = port->tty; 170 wport->port.tty = tty; /* FIXME */
170 171
171 /* Start reading from the device */ 172 /* Start reading from the device */
172 usb_fill_bulk_urb(port->read_urb, serial->dev, 173 usb_fill_bulk_urb(port->read_urb, serial->dev,
@@ -181,7 +182,8 @@ static int omninet_open (struct usb_serial_port *port, struct file *filp)
181 return result; 182 return result;
182} 183}
183 184
184static void omninet_close (struct usb_serial_port *port, struct file * filp) 185static void omninet_close(struct tty_struct *tty,
186 struct usb_serial_port *port, struct file * filp)
185{ 187{
186 dbg("%s - port %d", __func__, port->number); 188 dbg("%s - port %d", __func__, port->number);
187 usb_kill_urb(port->read_urb); 189 usb_kill_urb(port->read_urb);
@@ -221,9 +223,9 @@ static void omninet_read_bulk_callback (struct urb *urb)
221 223
222 if (urb->actual_length && header->oh_len) { 224 if (urb->actual_length && header->oh_len) {
223 for (i = 0; i < header->oh_len; i++) { 225 for (i = 0; i < header->oh_len; i++) {
224 tty_insert_flip_char(port->tty, data[OMNINET_DATAOFFSET + i], 0); 226 tty_insert_flip_char(port->port.tty, data[OMNINET_DATAOFFSET + i], 0);
225 } 227 }
226 tty_flip_buffer_push(port->tty); 228 tty_flip_buffer_push(port->port.tty);
227 } 229 }
228 230
229 /* Continue trying to always read */ 231 /* Continue trying to always read */
@@ -238,7 +240,8 @@ static void omninet_read_bulk_callback (struct urb *urb)
238 return; 240 return;
239} 241}
240 242
241static int omninet_write (struct usb_serial_port *port, const unsigned char *buf, int count) 243static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
244 const unsigned char *buf, int count)
242{ 245{
243 struct usb_serial *serial = port->serial; 246 struct usb_serial *serial = port->serial;
244 struct usb_serial_port *wport = serial->port[1]; 247 struct usb_serial_port *wport = serial->port[1];
@@ -290,8 +293,9 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
290} 293}
291 294
292 295
293static int omninet_write_room (struct usb_serial_port *port) 296static int omninet_write_room (struct tty_struct *tty)
294{ 297{
298 struct usb_serial_port *port = tty->driver_data;
295 struct usb_serial *serial = port->serial; 299 struct usb_serial *serial = port->serial;
296 struct usb_serial_port *wport = serial->port[1]; 300 struct usb_serial_port *wport = serial->port[1];
297 301