Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb98f0e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: ch341: replace custom ioctl operation with tiocmiwait 



Replace custom ioctl operation with tiocmiwait.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7caed7e7

drivers/usb/serial/ch341.c

+3 −22
Original line number Original line Diff line number Diff line
@@ -500,8 +500,9 @@ static void ch341_read_int_callback(struct urb *urb) 
			__func__, status);

			__func__, status);

}

}





static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)

static int ch341_tiocmiwait(struct tty_struct *tty, unsigned long arg)

{

{

	struct usb_serial_port *port = tty->driver_data;

	struct ch341_private *priv = usb_get_serial_port_data(port);

	struct ch341_private *priv = usb_get_serial_port_data(port);

	unsigned long flags;

	unsigned long flags;

	u8 prevstatus;

	u8 prevstatus;
@@ -542,26 +543,6 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) 
	return 0;

	return 0;

}

}





static int ch341_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;



	dev_dbg(&port->dev, "%s (%d) cmd = 0x%04x\n", __func__, port->number, cmd);



	switch (cmd) {

	case TIOCMIWAIT:

		dev_dbg(&port->dev, "%s (%d) TIOCMIWAIT\n", __func__,  port->number);

		return wait_modem_info(port, arg);



	default:

		dev_dbg(&port->dev, "%s not supported = 0x%04x\n", __func__, cmd);

		break;

	}



	return -ENOIOCTLCMD;

}



static int ch341_tiocmget(struct tty_struct *tty)

static int ch341_tiocmget(struct tty_struct *tty)

{

{

	struct usb_serial_port *port = tty->driver_data;

	struct usb_serial_port *port = tty->driver_data;
@@ -611,11 +592,11 @@ static struct usb_serial_driver ch341_device = { 
	.dtr_rts	   = ch341_dtr_rts,

	.dtr_rts	   = ch341_dtr_rts,

	.carrier_raised	   = ch341_carrier_raised,

	.carrier_raised	   = ch341_carrier_raised,

	.close             = ch341_close,

	.close             = ch341_close,

	.ioctl             = ch341_ioctl,

	.set_termios       = ch341_set_termios,

	.set_termios       = ch341_set_termios,

	.break_ctl         = ch341_break_ctl,

	.break_ctl         = ch341_break_ctl,

	.tiocmget          = ch341_tiocmget,

	.tiocmget          = ch341_tiocmget,

	.tiocmset          = ch341_tiocmset,

	.tiocmset          = ch341_tiocmset,

	.tiocmiwait        = ch341_tiocmiwait,

	.read_int_callback = ch341_read_int_callback,

	.read_int_callback = ch341_read_int_callback,

	.port_probe        = ch341_port_probe,

	.port_probe        = ch341_port_probe,

	.port_remove       = ch341_port_remove,

	.port_remove       = ch341_port_remove,