Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753927AbZJYRxv (ORCPT ); Sun, 25 Oct 2009 13:53:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753749AbZJYRxb (ORCPT ); Sun, 25 Oct 2009 13:53:31 -0400 Received: from mail-ew0-f208.google.com ([209.85.219.208]:46624 "EHLO mail-ew0-f208.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753875AbZJYRxT (ORCPT ); Sun, 25 Oct 2009 13:53:19 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:references:user-agent:date:from:to:cc:subject :content-disposition; b=AGk4vBwBW8K4wFnbe23BxpAF8SlxBFUqXbKVCPvd/qOvIE9MKTv1wDE5aiqI5PZGeh LDVOky1qeBLm6nhHHeupjeod3OBczU4nUQVchQbEpc9F7B/1ZQydkAmkCTk1i99ooEOW ldGQCAocY7ZYz7MmYIDbcyZvYVpsdBPnslq1M= Message-Id: <20091025175321.276761473@gmail.com> References: <20091025175057.270011110@gmail.com> User-Agent: quilt/0.46-1 Date: Sun, 25 Oct 2009 18:51:00 +0100 From: bart.hartgers@gmail.com To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Bart Hartgers Subject: [PATCH 3/7] ark3116: (3rd try) Replace cmget Content-Disposition: inline; filename=0020_ark3116_cmget.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2114 Lines: 61 Signed-off-by: Bart Hartgers --- Index: linux-2.6.32-rc4/drivers/usb/serial/ark3116.c =================================================================== --- linux-2.6.32-rc4.orig/drivers/usb/serial/ark3116.c 2009-10-18 16:20:02.000000000 +0200 +++ linux-2.6.32-rc4/drivers/usb/serial/ark3116.c 2009-10-18 16:20:13.000000000 +0200 @@ -526,32 +526,21 @@ static int ark3116_ioctl(struct tty_stru static int ark3116_tiocmget(struct tty_struct *tty, struct file *file) { struct usb_serial_port *port = tty->driver_data; - struct usb_serial *serial = port->serial; - char *buf; - char temp; - - /* seems like serial port status info (RTS, CTS, ...) is stored - * in reg(?) 0x0006 - * pcb connection point 11 = GND -> sets bit4 of response - * pcb connection point 7 = GND -> sets bit6 of response - */ - - buf = kmalloc(1, GFP_KERNEL); - if (!buf) { - dbg("error kmalloc"); - return -ENOMEM; - } - - /* read register */ - ARK3116_RCV_QUIET(serial, 0xFE, 0xC0, 0x0000, 0x0006, buf); - temp = buf[0]; - kfree(buf); - - /* i do not really know if bit4=CTS and bit6=DSR... just a - * quick guess! - */ - return (temp & (1<<4) ? TIOCM_CTS : 0) - | (temp & (1<<6) ? TIOCM_DSR : 0); + struct ark3116_private *priv = usb_get_serial_port_data(port); + + /* read modem status */ + unsigned status = atomic_read(&priv->msr); + /* modem control is output */ + unsigned ctrl = atomic_read(&priv->mcr); + + return (status & UART_MSR_DSR ? TIOCM_DSR : 0) | + (status & UART_MSR_CTS ? TIOCM_CTS : 0) | + (status & UART_MSR_RI ? TIOCM_RI : 0) | + (status & UART_MSR_DCD ? TIOCM_CD : 0) | + (ctrl & UART_MCR_DTR ? TIOCM_DTR : 0) | + (ctrl & UART_MCR_RTS ? TIOCM_RTS : 0) | + (ctrl & UART_MCR_OUT1 ? TIOCM_OUT1 : 0) | + (ctrl & UART_MCR_OUT2 ? TIOCM_OUT2 : 0); } static struct usb_driver ark3116_driver = { -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/