Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mos7840: switch to ->get_serial()

Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro b27ef409 7cf3e600

+13 -26
+13 -26
drivers/usb/serial/mos7840.c
··· 1931 1931 * function to get information about serial port 1932 1932 *****************************************************************************/ 1933 1933 1934 - static int mos7840_get_serial_info(struct moschip_port *mos7840_port, 1935 - struct serial_struct __user *retinfo) 1934 + static int mos7840_get_serial_info(struct tty_struct *tty, 1935 + struct serial_struct *ss) 1936 1936 { 1937 - struct serial_struct tmp; 1937 + struct usb_serial_port *port = tty->driver_data; 1938 + struct moschip_port *mos7840_port = mos7840_get_port_private(port); 1938 1939 1939 - if (mos7840_port == NULL) 1940 - return -1; 1941 - 1942 - memset(&tmp, 0, sizeof(tmp)); 1943 - 1944 - tmp.type = PORT_16550A; 1945 - tmp.line = mos7840_port->port->minor; 1946 - tmp.port = mos7840_port->port->port_number; 1947 - tmp.irq = 0; 1948 - tmp.xmit_fifo_size = NUM_URBS * URB_TRANSFER_BUFFER_SIZE; 1949 - tmp.baud_base = 9600; 1950 - tmp.close_delay = 5 * HZ; 1951 - tmp.closing_wait = 30 * HZ; 1952 - 1953 - if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) 1954 - return -EFAULT; 1940 + ss->type = PORT_16550A; 1941 + ss->line = mos7840_port->port->minor; 1942 + ss->port = mos7840_port->port->port_number; 1943 + ss->irq = 0; 1944 + ss->xmit_fifo_size = NUM_URBS * URB_TRANSFER_BUFFER_SIZE; 1945 + ss->baud_base = 9600; 1946 + ss->close_delay = 5 * HZ; 1947 + ss->closing_wait = 30 * HZ; 1955 1948 return 0; 1956 1949 } 1957 1950 ··· 1975 1982 dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__); 1976 1983 return mos7840_get_lsr_info(tty, argp); 1977 1984 1978 - case TIOCGSERIAL: 1979 - dev_dbg(&port->dev, "%s TIOCGSERIAL\n", __func__); 1980 - return mos7840_get_serial_info(mos7840_port, argp); 1981 - 1982 - case TIOCSSERIAL: 1983 - dev_dbg(&port->dev, "%s TIOCSSERIAL\n", __func__); 1984 - break; 1985 1985 default: 1986 1986 break; 1987 1987 } ··· 2362 2376 .calc_num_ports = mos7840_calc_num_ports, 2363 2377 .probe = mos7840_probe, 2364 2378 .ioctl = mos7840_ioctl, 2379 + .get_serial = mos7840_get_serial_info, 2365 2380 .set_termios = mos7840_set_termios, 2366 2381 .break_ctl = mos7840_break, 2367 2382 .tiocmget = mos7840_tiocmget,