]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
USB: ftdi_sio: remove unused rx_byte counter
authorJohan Hovold <jhovold@gmail.com>
Wed, 7 Oct 2009 18:05:05 +0000 (20:05 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Oct 2009 20:52:05 +0000 (13:52 -0700)
Remove unused rx_byte counter which is never exposed as noted by Alan
Cox.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/ftdi_sio.c

index 0ac2c2f540c950eeaeb994bc5dbd0fea84a163ed..bfb23d64bc6a7a89ea50da76e59b5ff26b3e5516 100644 (file)
@@ -81,7 +81,6 @@ struct ftdi_private {
        struct delayed_work rx_work;
        struct usb_serial_port *port;
        int rx_processed;
-       unsigned long rx_bytes;
 
        __u16 interface;        /* FT2232C, FT2232H or FT4232H port interface
                                   (0 for FT232/245) */
@@ -1699,9 +1698,6 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
        spin_lock_irqsave(&priv->tx_lock, flags);
        priv->tx_bytes = 0;
        spin_unlock_irqrestore(&priv->tx_lock, flags);
-       spin_lock_irqsave(&priv->rx_lock, flags);
-       priv->rx_bytes = 0;
-       spin_unlock_irqrestore(&priv->rx_lock, flags);
 
        write_latency_timer(port);
 
@@ -2014,8 +2010,6 @@ static void ftdi_read_bulk_callback(struct urb *urb)
        struct usb_serial_port *port = urb->context;
        struct tty_struct *tty;
        struct ftdi_private *priv;
-       unsigned long countread;
-       unsigned long flags;
        int status = urb->status;
 
        if (urb->number_of_packets > 0) {
@@ -2054,13 +2048,6 @@ static void ftdi_read_bulk_callback(struct urb *urb)
                goto out;
        }
 
-       /* count data bytes, but not status bytes */
-       countread = urb->actual_length;
-       countread -= 2 * DIV_ROUND_UP(countread, priv->max_packet_size);
-       spin_lock_irqsave(&priv->rx_lock, flags);
-       priv->rx_bytes += countread;
-       spin_unlock_irqrestore(&priv->rx_lock, flags);
-
        ftdi_process_read(&priv->rx_work.work);
 out:
        tty_kref_put(tty);