summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-11-18 13:23:26 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 13:33:54 -0800
commit37203d6f1d0bef0c0943f3d853efdccb3246e7a6 (patch)
tree4e0ed6e696f13f4769f848e5c40ed724f5e04924 /drivers/usb
parentb0f4765ae0f095bdc3d090937e72a198dee5cd39 (diff)
USB: opticon: remove private usb-serial data
Remove redundant usb-serial field from private data. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/opticon.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 2fc3dfc57f48..a515c5fda8a9 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -40,7 +40,6 @@ MODULE_DEVICE_TABLE(usb, id_table);
/* This structure holds all of the individual device information */
struct opticon_private {
- struct usb_serial *serial;
struct usb_serial_port *port;
unsigned char *bulk_in_buffer;
struct urb *bulk_read_urb;
@@ -438,7 +437,7 @@ static int get_serial_info(struct opticon_private *priv,
/* fake emulate a 16550 uart to make userspace code happy */
tmp.type = PORT_16550A;
- tmp.line = priv->serial->minor;
+ tmp.line = priv->port->serial->minor;
tmp.port = 0;
tmp.irq = 0;
tmp.flags = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
@@ -484,7 +483,6 @@ static int opticon_startup(struct usb_serial *serial)
return -ENOMEM;
}
spin_lock_init(&priv->lock);
- priv->serial = serial;
priv->port = serial->port[0];
/* find our bulk endpoint */