diff options
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 96686471472d..9594e357a914 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -88,7 +88,6 @@ struct ftdi_private { | |||
88 | 88 | ||
89 | unsigned int latency; /* latency setting in use */ | 89 | unsigned int latency; /* latency setting in use */ |
90 | spinlock_t tx_lock; /* spinlock for transmit state */ | 90 | spinlock_t tx_lock; /* spinlock for transmit state */ |
91 | unsigned long tx_bytes; | ||
92 | unsigned long tx_outstanding_bytes; | 91 | unsigned long tx_outstanding_bytes; |
93 | unsigned long tx_outstanding_urbs; | 92 | unsigned long tx_outstanding_urbs; |
94 | unsigned short max_packet_size; | 93 | unsigned short max_packet_size; |
@@ -1729,10 +1728,6 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
1729 | 1728 | ||
1730 | dbg("%s", __func__); | 1729 | dbg("%s", __func__); |
1731 | 1730 | ||
1732 | spin_lock_irqsave(&priv->tx_lock, flags); | ||
1733 | priv->tx_bytes = 0; | ||
1734 | spin_unlock_irqrestore(&priv->tx_lock, flags); | ||
1735 | |||
1736 | write_latency_timer(port); | 1731 | write_latency_timer(port); |
1737 | 1732 | ||
1738 | /* No error checking for this (will get errors later anyway) */ | 1733 | /* No error checking for this (will get errors later anyway) */ |
@@ -1917,7 +1912,6 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
1917 | } else { | 1912 | } else { |
1918 | spin_lock_irqsave(&priv->tx_lock, flags); | 1913 | spin_lock_irqsave(&priv->tx_lock, flags); |
1919 | priv->tx_outstanding_bytes += count; | 1914 | priv->tx_outstanding_bytes += count; |
1920 | priv->tx_bytes += count; | ||
1921 | spin_unlock_irqrestore(&priv->tx_lock, flags); | 1915 | spin_unlock_irqrestore(&priv->tx_lock, flags); |
1922 | } | 1916 | } |
1923 | 1917 | ||