From: Himadri Pandya <himadrispandya@gmail.com>
To: johan@kernel.org, gregkh@linuxfoundation.org,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Linux-kernel-mentees] [PATCH 05/15] usb: serial: cypress_m8: use usb_control_msg_recv() and usb_control_msg_send()
Date: Wed, 4 Nov 2020 12:16:53 +0530 [thread overview]
Message-ID: <20201104064703.15123-6-himadrispandya@gmail.com> (raw)
In-Reply-To: <20201104064703.15123-1-himadrispandya@gmail.com>
The new usb_control_msg_recv() and usb_control_msg_send() nicely wraps
usb_control_msg() with proper error check. Hence use the wrappers
instead of calling usb_control_msg() directly.
Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
---
drivers/usb/serial/cypress_m8.c | 38 +++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index cc028601c388..4d66cab8eece 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -341,20 +341,21 @@ static int cypress_serial_control(struct tty_struct *tty,
feature_buffer[4]);
do {
- retval = usb_control_msg(port->serial->dev,
- usb_sndctrlpipe(port->serial->dev, 0),
- HID_REQ_SET_REPORT,
- USB_DIR_OUT | USB_RECIP_INTERFACE | USB_TYPE_CLASS,
- 0x0300, 0, feature_buffer,
- feature_len, 500);
+ retval = usb_control_msg_send(port->serial->dev, 0,
+ HID_REQ_SET_REPORT,
+ USB_DIR_OUT |
+ USB_RECIP_INTERFACE |
+ USB_TYPE_CLASS, 0x0300,
+ 0, feature_buffer,
+ feature_len, 500,
+ GFP_KERNEL);
if (tries++ >= 3)
break;
- } while (retval != feature_len &&
- retval != -ENODEV);
+ } while (retval != -ENODEV);
- if (retval != feature_len) {
+ if (retval) {
dev_err(dev, "%s - failed sending serial line settings - %d\n",
__func__, retval);
cypress_set_dead(port);
@@ -379,19 +380,20 @@ static int cypress_serial_control(struct tty_struct *tty,
}
dev_dbg(dev, "%s - retrieving serial line settings\n", __func__);
do {
- retval = usb_control_msg(port->serial->dev,
- usb_rcvctrlpipe(port->serial->dev, 0),
- HID_REQ_GET_REPORT,
- USB_DIR_IN | USB_RECIP_INTERFACE | USB_TYPE_CLASS,
- 0x0300, 0, feature_buffer,
- feature_len, 500);
+ retval = usb_control_msg_recv(port->serial->dev, 0,
+ HID_REQ_GET_REPORT,
+ USB_DIR_IN |
+ USB_RECIP_INTERFACE |
+ USB_TYPE_CLASS, 0x0300,
+ 0, feature_buffer,
+ feature_len, 500,
+ GFP_KERNEL);
if (tries++ >= 3)
break;
- } while (retval != feature_len
- && retval != -ENODEV);
+ } while (retval != -ENODEV);
- if (retval != feature_len) {
+ if (retval) {
dev_err(dev, "%s - failed to retrieve serial line settings - %d\n",
__func__, retval);
cypress_set_dead(port);
--
2.17.1
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-11-04 6:47 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 6:46 [Linux-kernel-mentees] [PATCH 00/15] usb: serial: avoid using usb_control_msg() directly Himadri Pandya
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 01/15] usb: serial: ark3116: use usb_control_msg_recv() and usb_control_msg_send() Himadri Pandya
2020-12-04 9:16 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 02/15] usb: serial: belkin_sa: use usb_control_msg_send() Himadri Pandya
2020-12-04 9:17 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 03/15] usb: serial: ch314: use usb_control_msg_recv() and usb_control_msg_send() Himadri Pandya
2020-12-04 9:24 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 04/15] usb: serial: cp210x: " Himadri Pandya
2020-12-04 9:34 ` Johan Hovold
2020-11-04 6:46 ` Himadri Pandya [this message]
2020-12-04 9:37 ` [Linux-kernel-mentees] [PATCH 05/15] usb: serial: cypress_m8: " Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 06/15] usb: serial: f81232: " Himadri Pandya
2020-12-04 9:49 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 07/15] usb: serial: f81534: " Himadri Pandya
2020-12-04 9:55 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 08/15] usb: serial: ftdi_sio: " Himadri Pandya
2020-12-04 10:03 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 09/15] usb: serial: io_edgeport: " Himadri Pandya
2020-12-04 10:10 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 10/15] usb: serial: io_ti: " Himadri Pandya
2020-12-04 10:12 ` Johan Hovold
2020-11-04 6:46 ` [Linux-kernel-mentees] [PATCH 11/15] usb: serial: ipaq: use usb_control_msg_send() Himadri Pandya
2020-12-04 10:21 ` Johan Hovold
2020-11-04 6:47 ` [Linux-kernel-mentees] [PATCH 12/15] usb: serial: ipw: " Himadri Pandya
2020-12-04 10:27 ` Johan Hovold
2020-11-04 6:47 ` [Linux-kernel-mentees] [PATCH 13/15] usb: serial: iuu_phoenix: " Himadri Pandya
2020-12-04 10:28 ` Johan Hovold
2020-11-04 6:47 ` [Linux-kernel-mentees] [PATCH 14/15] usb: serial: keyspan_pda: use usb_control_msg_recv() and usb_control_msg_send() Himadri Pandya
2020-12-04 10:31 ` Johan Hovold
2020-11-04 6:47 ` [Linux-kernel-mentees] [PATCH 15/15] usb: serial: kl5kusb105: " Himadri Pandya
2020-12-04 10:37 ` Johan Hovold
2020-11-06 10:43 ` [Linux-kernel-mentees] [PATCH 00/15] usb: serial: avoid using usb_control_msg() directly Greg KH
2020-12-04 9:09 ` Johan Hovold
2020-12-24 10:01 ` Himadri Pandya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201104064703.15123-6-himadrispandya@gmail.com \
--to=himadrispandya@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).