Commit 4bb4e638 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: f81232: add custom tiocmiwait operation

Break out TIOCMIWAIT handling from custom ioctl operation and use
tiocmiwait operation field instead.
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7fa5774
...@@ -242,8 +242,9 @@ static int f81232_carrier_raised(struct usb_serial_port *port) ...@@ -242,8 +242,9 @@ static int f81232_carrier_raised(struct usb_serial_port *port)
return 0; return 0;
} }
static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) static int f81232_tiocmiwait(struct tty_struct *tty, unsigned long arg)
{ {
struct usb_serial_port *port = tty->driver_data;
struct f81232_private *priv = usb_get_serial_port_data(port); struct f81232_private *priv = usb_get_serial_port_data(port);
unsigned long flags; unsigned long flags;
unsigned int prevstatus; unsigned int prevstatus;
...@@ -302,11 +303,6 @@ static int f81232_ioctl(struct tty_struct *tty, ...@@ -302,11 +303,6 @@ static int f81232_ioctl(struct tty_struct *tty,
return -EFAULT; return -EFAULT;
return 0; return 0;
case TIOCMIWAIT:
dev_dbg(&port->dev, "%s (%d) TIOCMIWAIT\n", __func__,
port->number);
return wait_modem_info(port, arg);
default: default:
dev_dbg(&port->dev, "%s not supported = 0x%04x\n", dev_dbg(&port->dev, "%s not supported = 0x%04x\n",
__func__, cmd); __func__, cmd);
...@@ -358,6 +354,7 @@ static struct usb_serial_driver f81232_device = { ...@@ -358,6 +354,7 @@ static struct usb_serial_driver f81232_device = {
.set_termios = f81232_set_termios, .set_termios = f81232_set_termios,
.tiocmget = f81232_tiocmget, .tiocmget = f81232_tiocmget,
.tiocmset = f81232_tiocmset, .tiocmset = f81232_tiocmset,
.tiocmiwait = f81232_tiocmiwait,
.process_read_urb = f81232_process_read_urb, .process_read_urb = f81232_process_read_urb,
.read_int_callback = f81232_read_int_callback, .read_int_callback = f81232_read_int_callback,
.port_probe = f81232_port_probe, .port_probe = f81232_port_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment