USB: opticon: remove private usb-serial data
authorJohan Hovold <jhovold@gmail.com>
Sun, 18 Nov 2012 12:23:26 +0000 (13:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 21:33:54 +0000 (13:33 -0800)
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>
drivers/usb/serial/opticon.c

index 2fc3dfc57f484655ff32721a8c165bcf149a3c64..a515c5fda8a99f5c9c854f76a9acacb1004f21ef 100644 (file)
@@ -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 */