diff options
| author | Johan Hovold <johan@kernel.org> | 2021-07-05 10:20:13 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2021-07-30 17:19:41 +0200 |
| commit | 33a61d2cc731d1c8a763f147528fc5e46978599f (patch) | |
| tree | 45951dbda5da036e6d35bd99e13bb9d3e7d11f47 /drivers/usb | |
| parent | befc28a720362cb2b14601b5ba3d1f4c600ffaec (diff) | |
| download | linux-stable-33a61d2cc731d1c8a763f147528fc5e46978599f.tar.gz linux-stable-33a61d2cc731d1c8a763f147528fc5e46978599f.tar.bz2 linux-stable-33a61d2cc731d1c8a763f147528fc5e46978599f.zip | |
USB: serial: cp210x: clean up set-chars request
Use the generic control request helper to implement the SET_CHARS
request.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/cp210x.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 779a94a83485..c19073ae3891 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -1145,31 +1145,6 @@ static void cp210x_disable_event_mode(struct usb_serial_port *port) port_priv->event_mode = false; } -static int cp210x_set_chars(struct usb_serial_port *port, - struct cp210x_special_chars *chars) -{ - struct cp210x_port_private *port_priv = usb_get_serial_port_data(port); - struct usb_serial *serial = port->serial; - void *dmabuf; - int result; - - dmabuf = kmemdup(chars, sizeof(*chars), GFP_KERNEL); - if (!dmabuf) - return -ENOMEM; - - result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), - CP210X_SET_CHARS, REQTYPE_HOST_TO_INTERFACE, 0, - port_priv->bInterfaceNumber, - dmabuf, sizeof(*chars), USB_CTRL_SET_TIMEOUT); - - kfree(dmabuf); - - if (result < 0) - return result; - - return 0; -} - static bool cp210x_termios_change(const struct ktermios *a, const struct ktermios *b) { bool iflag_change, cc_change; @@ -1217,7 +1192,8 @@ static void cp210x_set_flow_control(struct tty_struct *tty, chars.bXonChar = START_CHAR(tty); chars.bXoffChar = STOP_CHAR(tty); - ret = cp210x_set_chars(port, &chars); + ret = cp210x_write_reg_block(port, CP210X_SET_CHARS, &chars, + sizeof(chars)); if (ret) { dev_err(&port->dev, "failed to set special chars: %d\n", ret); |