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,
Himadri Pandya <himadrispandya@gmail.com>
Subject: [PATCH 07/15] usb: serial: f81534: use usb_control_msg_recv() and usb_control_msg_send()
Date: Wed, 4 Nov 2020 12:16:55 +0530 [thread overview]
Message-ID: <20201104064703.15123-8-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/f81534.c | 63 +++++++++++--------------------------
1 file changed, 18 insertions(+), 45 deletions(-)
diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c
index 5661fd03e545..23eb17a2c052 100644
--- a/drivers/usb/serial/f81534.c
+++ b/drivers/usb/serial/f81534.c
@@ -217,38 +217,26 @@ static int f81534_set_register(struct usb_serial *serial, u16 reg, u8 data)
struct usb_device *dev = serial->dev;
size_t count = F81534_USB_MAX_RETRY;
int status;
- u8 *tmp;
-
- tmp = kmalloc(sizeof(u8), GFP_KERNEL);
- if (!tmp)
- return -ENOMEM;
-
- *tmp = data;
/*
* Our device maybe not reply when heavily loading, We'll retry for
* F81534_USB_MAX_RETRY times.
*/
while (count--) {
- status = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- F81534_SET_GET_REGISTER,
- USB_TYPE_VENDOR | USB_DIR_OUT,
- reg, 0, tmp, sizeof(u8),
- F81534_USB_TIMEOUT);
- if (status > 0) {
- status = 0;
- break;
- } else if (status == 0) {
- status = -EIO;
+ status = usb_control_msg_send(dev, 0, F81534_SET_GET_REGISTER,
+ USB_TYPE_VENDOR | USB_DIR_OUT,
+ reg, 0, &data, sizeof(u8),
+ F81534_USB_TIMEOUT, GFP_KERNEL);
+ if (status) {
+ /* Try again */
+ continue;
}
}
- if (status < 0) {
+ if (status)
dev_err(&interface->dev, "%s: reg: %x data: %x failed: %d\n",
- __func__, reg, data, status);
- }
+ __func__, reg, data, status);
- kfree(tmp);
return status;
}
@@ -258,40 +246,25 @@ static int f81534_get_register(struct usb_serial *serial, u16 reg, u8 *data)
struct usb_device *dev = serial->dev;
size_t count = F81534_USB_MAX_RETRY;
int status;
- u8 *tmp;
-
- tmp = kmalloc(sizeof(u8), GFP_KERNEL);
- if (!tmp)
- return -ENOMEM;
/*
* Our device maybe not reply when heavily loading, We'll retry for
* F81534_USB_MAX_RETRY times.
*/
while (count--) {
- status = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
- F81534_SET_GET_REGISTER,
- USB_TYPE_VENDOR | USB_DIR_IN,
- reg, 0, tmp, sizeof(u8),
- F81534_USB_TIMEOUT);
- if (status > 0) {
- status = 0;
- break;
- } else if (status == 0) {
- status = -EIO;
+ status = usb_control_msg_recv(dev, 0, F81534_SET_GET_REGISTER,
+ USB_TYPE_VENDOR | USB_DIR_IN, reg,
+ 0, data, sizeof(u8),
+ F81534_USB_TIMEOUT, GFP_KERNEL);
+ if (status) {
+ /* Try again */
+ continue;
}
}
- if (status < 0) {
+ if (status)
dev_err(&interface->dev, "%s: reg: %x failed: %d\n", __func__,
- reg, status);
- goto end;
- }
-
- *data = *tmp;
-
-end:
- kfree(tmp);
+ reg, status);
return status;
}
--
2.17.1
next prev parent reply other threads:[~2020-11-04 6:48 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 6:46 [PATCH 00/15] usb: serial: avoid using usb_control_msg() directly Himadri Pandya
2020-11-04 6:46 ` [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 ` [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 ` [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 ` [PATCH 04/15] usb: serial: cp210x: " Himadri Pandya
2020-12-04 9:34 ` Johan Hovold
2020-11-04 6:46 ` [PATCH 05/15] usb: serial: cypress_m8: " Himadri Pandya
2020-12-04 9:37 ` Johan Hovold
2020-11-04 6:46 ` [PATCH 06/15] usb: serial: f81232: " Himadri Pandya
2020-12-04 9:49 ` Johan Hovold
2020-11-04 6:46 ` Himadri Pandya [this message]
2020-12-04 9:55 ` [PATCH 07/15] usb: serial: f81534: " Johan Hovold
2020-11-04 6:46 ` [PATCH 08/15] usb: serial: ftdi_sio: " Himadri Pandya
2020-12-04 10:03 ` Johan Hovold
2020-11-04 6:46 ` [PATCH 09/15] usb: serial: io_edgeport: " Himadri Pandya
2020-12-04 10:10 ` Johan Hovold
2020-11-04 6:46 ` [PATCH 10/15] usb: serial: io_ti: " Himadri Pandya
2020-12-04 10:12 ` Johan Hovold
2020-11-04 6:46 ` [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 ` [PATCH 12/15] usb: serial: ipw: " Himadri Pandya
2020-12-04 10:27 ` Johan Hovold
2020-11-04 6:47 ` [PATCH 13/15] usb: serial: iuu_phoenix: " Himadri Pandya
2020-12-04 10:28 ` Johan Hovold
2020-11-04 6:47 ` [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 ` [PATCH 15/15] usb: serial: kl5kusb105: " Himadri Pandya
2020-12-04 10:37 ` Johan Hovold
2020-11-06 10:43 ` [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-8-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).