aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-04-16 12:01:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-17 13:05:35 -0400
commitef31025d6811320ead36a8902b16090dea01b34c (patch)
tree390839169f9c4a6571347207fabee47913a6269c
parentcced926f0e4fb02a08d2d14e443631fe8a28db98 (diff)
USB: symbolserial: remove unused private data
Use port device for debug messages in interrupt-urb callback and remove unused private data. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/symbolserial.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 32ebddf7f010..2c2bfa1994f8 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -26,13 +26,10 @@ static const struct usb_device_id id_table[] = {
26}; 26};
27MODULE_DEVICE_TABLE(usb, id_table); 27MODULE_DEVICE_TABLE(usb, id_table);
28 28
29/* This structure holds all of the individual device information */
30struct symbol_private { 29struct symbol_private {
31 struct usb_device *udev;
32 spinlock_t lock; /* protects the following flags */ 30 spinlock_t lock; /* protects the following flags */
33 bool throttled; 31 bool throttled;
34 bool actually_throttled; 32 bool actually_throttled;
35 bool rts;
36}; 33};
37 34
38static void symbol_int_callback(struct urb *urb) 35static void symbol_int_callback(struct urb *urb)
@@ -77,7 +74,7 @@ static void symbol_int_callback(struct urb *urb)
77 tty_insert_flip_string(&port->port, &data[1], data_length); 74 tty_insert_flip_string(&port->port, &data[1], data_length);
78 tty_flip_buffer_push(&port->port); 75 tty_flip_buffer_push(&port->port);
79 } else { 76 } else {
80 dev_dbg(&priv->udev->dev, 77 dev_dbg(&port->dev,
81 "Improper amount of data received from the device, " 78 "Improper amount of data received from the device, "
82 "%d bytes", urb->actual_length); 79 "%d bytes", urb->actual_length);
83 } 80 }
@@ -170,7 +167,6 @@ static int symbol_startup(struct usb_serial *serial)
170 return -ENOMEM; 167 return -ENOMEM;
171 } 168 }
172 spin_lock_init(&priv->lock); 169 spin_lock_init(&priv->lock);
173 priv->udev = serial->dev;
174 170
175 usb_set_serial_data(serial, priv); 171 usb_set_serial_data(serial, priv);
176 return 0; 172 return 0;