diff options
Diffstat (limited to 'drivers/usb/serial/io_edgeport.c')
-rw-r--r-- | drivers/usb/serial/io_edgeport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index d06547a13f28..f623d58370a4 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -229,7 +229,7 @@ static int edge_write_room (struct usb_serial_port *port); | |||
229 | static int edge_chars_in_buffer (struct usb_serial_port *port); | 229 | static int edge_chars_in_buffer (struct usb_serial_port *port); |
230 | static void edge_throttle (struct usb_serial_port *port); | 230 | static void edge_throttle (struct usb_serial_port *port); |
231 | static void edge_unthrottle (struct usb_serial_port *port); | 231 | static void edge_unthrottle (struct usb_serial_port *port); |
232 | static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios); | 232 | static void edge_set_termios (struct usb_serial_port *port, struct ktermios *old_termios); |
233 | static int edge_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg); | 233 | static int edge_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg); |
234 | static void edge_break (struct usb_serial_port *port, int break_state); | 234 | static void edge_break (struct usb_serial_port *port, int break_state); |
235 | static int edge_tiocmget (struct usb_serial_port *port, struct file *file); | 235 | static int edge_tiocmget (struct usb_serial_port *port, struct file *file); |
@@ -257,7 +257,7 @@ static void handle_new_lsr (struct edgeport_port *edge_port, __u8 lsrData, __u8 | |||
257 | static int send_iosp_ext_cmd (struct edgeport_port *edge_port, __u8 command, __u8 param); | 257 | static int send_iosp_ext_cmd (struct edgeport_port *edge_port, __u8 command, __u8 param); |
258 | static int calc_baud_rate_divisor (int baud_rate, int *divisor); | 258 | static int calc_baud_rate_divisor (int baud_rate, int *divisor); |
259 | static int send_cmd_write_baud_rate (struct edgeport_port *edge_port, int baudRate); | 259 | static int send_cmd_write_baud_rate (struct edgeport_port *edge_port, int baudRate); |
260 | static void change_port_settings (struct edgeport_port *edge_port, struct termios *old_termios); | 260 | static void change_port_settings (struct edgeport_port *edge_port, struct ktermios *old_termios); |
261 | static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 regNum, __u8 regValue); | 261 | static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 regNum, __u8 regValue); |
262 | static int write_cmd_usb (struct edgeport_port *edge_port, unsigned char *buffer, int writeLength); | 262 | static int write_cmd_usb (struct edgeport_port *edge_port, unsigned char *buffer, int writeLength); |
263 | static void send_more_port_data (struct edgeport_serial *edge_serial, struct edgeport_port *edge_port); | 263 | static void send_more_port_data (struct edgeport_serial *edge_serial, struct edgeport_port *edge_port); |
@@ -1431,7 +1431,7 @@ static void edge_unthrottle (struct usb_serial_port *port) | |||
1431 | * SerialSetTermios | 1431 | * SerialSetTermios |
1432 | * this function is called by the tty driver when it wants to change the termios structure | 1432 | * this function is called by the tty driver when it wants to change the termios structure |
1433 | *****************************************************************************/ | 1433 | *****************************************************************************/ |
1434 | static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios) | 1434 | static void edge_set_termios (struct usb_serial_port *port, struct ktermios *old_termios) |
1435 | { | 1435 | { |
1436 | struct edgeport_port *edge_port = usb_get_serial_port_data(port); | 1436 | struct edgeport_port *edge_port = usb_get_serial_port_data(port); |
1437 | struct tty_struct *tty = port->tty; | 1437 | struct tty_struct *tty = port->tty; |
@@ -2412,7 +2412,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r | |||
2412 | #ifndef CMSPAR | 2412 | #ifndef CMSPAR |
2413 | #define CMSPAR 0 | 2413 | #define CMSPAR 0 |
2414 | #endif | 2414 | #endif |
2415 | static void change_port_settings (struct edgeport_port *edge_port, struct termios *old_termios) | 2415 | static void change_port_settings (struct edgeport_port *edge_port, struct ktermios *old_termios) |
2416 | { | 2416 | { |
2417 | struct tty_struct *tty; | 2417 | struct tty_struct *tty; |
2418 | int baud; | 2418 | int baud; |