leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: opticon: pass port to get_serial_info

Browse Source 
Pass port rather then private data to get_serial_info, which only used
the private data to access the port.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2012-11-18 13:23:31 +01:00 committed by Greg Kroah-Hartman
parent 70d25eeeba
commit 56be1a17d7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/serial/opticon.c
View File

@ -425,7 +425,7 @@ static int opticon_tiocmset(struct tty_struct *tty,
return ret; return ret;
} }
static int get_serial_info(struct opticon_private *priv, static int get_serial_info(struct usb_serial_port *port,
struct serial_struct __user *serial) struct serial_struct __user *serial)
{ {
struct serial_struct tmp; struct serial_struct tmp;
@ -437,7 +437,7 @@ static int get_serial_info(struct opticon_private *priv,
/* fake emulate a 16550 uart to make userspace code happy */ /* fake emulate a 16550 uart to make userspace code happy */
tmp.type = PORT_16550A; tmp.type = PORT_16550A;
tmp.line = priv->port->serial->minor; tmp.line = port->serial->minor;
tmp.port = 0; tmp.port = 0;
tmp.irq = 0; tmp.irq = 0;
tmp.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; tmp.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
@ -455,13 +455,12 @@ static int opticon_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct opticon_private *priv = usb_get_serial_port_data(port);
dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd); dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
return get_serial_info(priv, return get_serial_info(port,
(struct serial_struct __user *)arg); (struct serial_struct __user *)arg);
} }