leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: oti6858: replace custom ioctl operation with tiocmiwait

Browse Source 
Replace custom ioctl operation with tiocmiwait.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-03-21 12:37:18 +01:00 committed by Greg Kroah-Hartman
parent 0c61337138
commit 1c9f995363
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/usb/serial/oti6858.c
View File

@ -124,8 +124,6 @@ static void oti6858_close(struct usb_serial_port *port);
static void oti6858_set_termios(struct tty_struct *tty, static void oti6858_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old); struct usb_serial_port *port, struct ktermios *old);
static void oti6858_init_termios(struct tty_struct *tty); static void oti6858_init_termios(struct tty_struct *tty);
static int oti6858_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void oti6858_read_int_callback(struct urb *urb); static void oti6858_read_int_callback(struct urb *urb);
static void oti6858_read_bulk_callback(struct urb *urb); static void oti6858_read_bulk_callback(struct urb *urb);
static void oti6858_write_bulk_callback(struct urb *urb); static void oti6858_write_bulk_callback(struct urb *urb);
@ -136,6 +134,7 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty);
static int oti6858_tiocmget(struct tty_struct *tty); static int oti6858_tiocmget(struct tty_struct *tty);
static int oti6858_tiocmset(struct tty_struct *tty, static int oti6858_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear); unsigned int set, unsigned int clear);
static int oti6858_tiocmiwait(struct tty_struct *tty, unsigned long arg);
static int oti6858_port_probe(struct usb_serial_port *port); static int oti6858_port_probe(struct usb_serial_port *port);
static int oti6858_port_remove(struct usb_serial_port *port); static int oti6858_port_remove(struct usb_serial_port *port);
@ -150,11 +149,11 @@ static struct usb_serial_driver oti6858_device = {
.open = oti6858_open, .open = oti6858_open,
.close = oti6858_close, .close = oti6858_close,
.write = oti6858_write, .write = oti6858_write,
.ioctl = oti6858_ioctl,
.set_termios = oti6858_set_termios, .set_termios = oti6858_set_termios,
.init_termios = oti6858_init_termios, .init_termios = oti6858_init_termios,
.tiocmget = oti6858_tiocmget, .tiocmget = oti6858_tiocmget,
.tiocmset = oti6858_tiocmset, .tiocmset = oti6858_tiocmset,
.tiocmiwait = oti6858_tiocmiwait,
.read_bulk_callback = oti6858_read_bulk_callback, .read_bulk_callback = oti6858_read_bulk_callback,
.read_int_callback = oti6858_read_int_callback, .read_int_callback = oti6858_read_int_callback,
.write_bulk_callback = oti6858_write_bulk_callback, .write_bulk_callback = oti6858_write_bulk_callback,
@ -650,8 +649,9 @@ static int oti6858_tiocmget(struct tty_struct *tty)
return result; return result;
} }
static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) static int oti6858_tiocmiwait(struct tty_struct *tty, unsigned long arg)
{ {
struct usb_serial_port *port = tty->driver_data;
struct oti6858_private *priv = usb_get_serial_port_data(port); struct oti6858_private *priv = usb_get_serial_port_data(port);
unsigned long flags; unsigned long flags;
unsigned int prev, status; unsigned int prev, status;
@ -689,24 +689,6 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
return 0; return 0;
} }
static int oti6858_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
dev_dbg(&port->dev, "%s(cmd = 0x%04x, arg = 0x%08lx)\n", __func__, cmd, arg);
switch (cmd) {
case TIOCMIWAIT:
dev_dbg(&port->dev, "%s(): TIOCMIWAIT\n", __func__);
return wait_modem_info(port, arg);
default:
dev_dbg(&port->dev, "%s(): 0x%04x not supported\n", __func__, cmd);
break;
}
return -ENOIOCTLCMD;
}
static void oti6858_read_int_callback(struct urb *urb) static void oti6858_read_int_callback(struct urb *urb)
{ {
struct usb_serial_port *port = urb->context; struct usb_serial_port *port = urb->context;