Switch to the generic get_icount implementation.
Signed-off-by: Johan Hovold <jhov...@gmail.com>
---
drivers/usb/serial/quatech2.c | 50 +++++++++++--------------------------------
1 file changed, 12 insertions(+), 38 deletions(-)
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 89709bd..8ce80a8 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -129,7 +129,6 @@ struct qt2_port_private {
u8 shadowMSR;
wait_queue_head_t delta_msr_wait; /* Used for TIOCMIWAIT */
- struct async_icount icount;
struct usb_serial_port *port;
};
@@ -502,16 +501,16 @@ static int wait_modem_info(struct usb_serial_port *port,
unsigned int arg)
unsigned long flags;
spin_lock_irqsave(&priv->lock, flags);
- prev = priv->icount;
+ prev = port->icount;
spin_unlock_irqrestore(&priv->lock, flags);
while (1) {
wait_event_interruptible(priv->delta_msr_wait,
(port->serial->disconnected ||
- (priv->icount.rng != prev.rng) ||
- (priv->icount.dsr != prev.dsr) ||
- (priv->icount.dcd != prev.dcd) ||
- (priv->icount.cts != prev.cts)));
+ (port->icount.rng != prev.rng) ||
+ (port->icount.dsr != prev.dsr) ||
+ (port->icount.dcd != prev.dcd) ||
+ (port->icount.cts != prev.cts)));
if (signal_pending(current))
return -ERESTARTSYS;
@@ -520,7 +519,7 @@ static int wait_modem_info(struct usb_serial_port *port,
unsigned int arg)
return -EIO;
spin_lock_irqsave(&priv->lock, flags);
- cur = priv->icount;
+ cur = port->icount;
spin_unlock_irqrestore(&priv->lock, flags);
if ((arg & TIOCM_RNG && (prev.rng != cur.rng)) ||
@@ -532,28 +531,6 @@ static int wait_modem_info(struct usb_serial_port *port,
unsigned int arg)
return 0;
}
-static int qt2_get_icount(struct tty_struct *tty,
- struct serial_icounter_struct *icount)
-{
- struct usb_serial_port *port = tty->driver_data;
- struct qt2_port_private *priv = usb_get_serial_port_data(port);
- struct async_icount cnow = priv->icount;
-
- icount->cts = cnow.cts;
- icount->dsr = cnow.dsr;
- icount->rng = cnow.rng;
- icount->dcd = cnow.dcd;
- icount->rx = cnow.rx;
- icount->tx = cnow.tx;
- icount->frame = cnow.frame;
- icount->overrun = cnow.overrun;
- icount->parity = cnow.parity;
- icount->brk = cnow.brk;
- icount->buf_overrun = cnow.buf_overrun;
-
- return 0;
-}
-
static int qt2_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
@@ -955,16 +932,13 @@ static void qt2_update_msr(struct usb_serial_port *port,
unsigned char *ch)
if (newMSR & UART_MSR_ANY_DELTA) {
/* update input line counters */
if (newMSR & UART_MSR_DCTS)
- port_priv->icount.cts++;
-
+ port->icount.cts++;
if (newMSR & UART_MSR_DDSR)
- port_priv->icount.dsr++;
-
+ port->icount.dsr++;
if (newMSR & UART_MSR_DDCD)
- port_priv->icount.dcd++;
-
+ port->icount.dcd++;
if (newMSR & UART_MSR_TERI)
- port_priv->icount.rng++;
+ port->icount.rng++;
wake_up_interruptible(&port_priv->delta_msr_wait);
}
@@ -986,7 +960,7 @@ static void qt2_update_lsr(struct usb_serial_port *port,
unsigned char *ch)
port_priv->shadowLSR = newLSR;
spin_unlock_irqrestore(&port_priv->lock, flags);
- icount = &port_priv->icount;
+ icount = &port->icount;
if (newLSR & UART_LSR_BRK_ERROR_BITS) {
@@ -1096,7 +1070,7 @@ static struct usb_serial_driver qt2_device = {
.break_ctl = qt2_break_ctl,
.tiocmget = qt2_tiocmget,
.tiocmset = qt2_tiocmset,
- .get_icount = qt2_get_icount,
+ .get_icount = usb_serial_generic_get_icount,
.ioctl = qt2_ioctl,
.set_termios = qt2_set_termios,
};
--
1.8.1.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
