Commit ee08cefb authored by Al Viro's avatar Al Viro
Browse files

ssu100: switch to ->get_serial() 



Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8fbde798

drivers/usb/serial/ssu100.c

+11 −31
Original line number Diff line number Diff line
@@ -331,39 +331,19 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port) 
	return usb_serial_generic_open(tty, port);

}



static int get_serial_info(struct usb_serial_port *port,

			   struct serial_struct __user *retinfo)

{

	struct serial_struct tmp;



	memset(&tmp, 0, sizeof(tmp));

	tmp.line		= port->minor;

	tmp.port		= 0;

	tmp.irq			= 0;

	tmp.xmit_fifo_size	= port->bulk_out_size;

	tmp.baud_base		= 9600;

	tmp.close_delay		= 5*HZ;

	tmp.closing_wait	= 30*HZ;



	if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))

		return -EFAULT;

	return 0;

}



static int ssu100_ioctl(struct tty_struct *tty,

		    unsigned int cmd, unsigned long arg)

static int get_serial_info(struct tty_struct *tty,

			   struct serial_struct *ss)

{

	struct usb_serial_port *port = tty->driver_data;



	switch (cmd) {

	case TIOCGSERIAL:

		return get_serial_info(port,

				       (struct serial_struct __user *) arg);

	default:

		break;

	}



	return -ENOIOCTLCMD;

	ss->line		= port->minor;

	ss->port		= 0;

	ss->irq			= 0;

	ss->xmit_fifo_size	= port->bulk_out_size;

	ss->baud_base		= 9600;

	ss->close_delay		= 5*HZ;

	ss->closing_wait	= 30*HZ;

	return 0;

}



static int ssu100_attach(struct usb_serial *serial)
@@ -566,7 +546,7 @@ static struct usb_serial_driver ssu100_device = { 
	.tiocmset            = ssu100_tiocmset,

	.tiocmiwait          = usb_serial_generic_tiocmiwait,

	.get_icount	     = usb_serial_generic_get_icount,

	.ioctl               = ssu100_ioctl,

	.get_serial          = get_serial_info,

	.set_termios         = ssu100_set_termios,

};