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

ssu100: switch to ->get_serial()

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

Al Viro ee08cefb 8fbde798

+11 -31
+11 -31
drivers/usb/serial/ssu100.c
··· 331 331 return usb_serial_generic_open(tty, port); 332 332 } 333 333 334 - static int get_serial_info(struct usb_serial_port *port, 335 - struct serial_struct __user *retinfo) 336 - { 337 - struct serial_struct tmp; 338 - 339 - memset(&tmp, 0, sizeof(tmp)); 340 - tmp.line = port->minor; 341 - tmp.port = 0; 342 - tmp.irq = 0; 343 - tmp.xmit_fifo_size = port->bulk_out_size; 344 - tmp.baud_base = 9600; 345 - tmp.close_delay = 5*HZ; 346 - tmp.closing_wait = 30*HZ; 347 - 348 - if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) 349 - return -EFAULT; 350 - return 0; 351 - } 352 - 353 - static int ssu100_ioctl(struct tty_struct *tty, 354 - unsigned int cmd, unsigned long arg) 334 + static int get_serial_info(struct tty_struct *tty, 335 + struct serial_struct *ss) 355 336 { 356 337 struct usb_serial_port *port = tty->driver_data; 357 338 358 - switch (cmd) { 359 - case TIOCGSERIAL: 360 - return get_serial_info(port, 361 - (struct serial_struct __user *) arg); 362 - default: 363 - break; 364 - } 365 - 366 - return -ENOIOCTLCMD; 339 + ss->line = port->minor; 340 + ss->port = 0; 341 + ss->irq = 0; 342 + ss->xmit_fifo_size = port->bulk_out_size; 343 + ss->baud_base = 9600; 344 + ss->close_delay = 5*HZ; 345 + ss->closing_wait = 30*HZ; 346 + return 0; 367 347 } 368 348 369 349 static int ssu100_attach(struct usb_serial *serial) ··· 546 566 .tiocmset = ssu100_tiocmset, 547 567 .tiocmiwait = usb_serial_generic_tiocmiwait, 548 568 .get_icount = usb_serial_generic_get_icount, 549 - .ioctl = ssu100_ioctl, 569 + .get_serial = get_serial_info, 550 570 .set_termios = ssu100_set_termios, 551 571 }; 552 572