From: Anant Thazhemadam <anant.thazhemadam@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Evgeny Novikov <novikov@ispras.ru>,
Anant Thazhemadam <anant.thazhemadam@gmail.com>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 12/15] usb: misc: lvstest: update to use the usb_control_msg_{send|recv}() API
Date: Sun, 29 Nov 2020 21:36:09 +0530 [thread overview]
Message-ID: <20201129160612.1908074-13-anant.thazhemadam@gmail.com> (raw)
In-Reply-To: <20201129160612.1908074-1-anant.thazhemadam@gmail.com>
The newer usb_control_msg_{send|recv}() API are an improvement on the
existing usb_control_msg() as it ensures that a short read/write is treated
as an error, data can be used off the stack, and raw usb pipes need not be
created in the calling functions.
For this reason, instances of usb_control_msg() have been replaced with
usb_control_msg_{recv|send}() and the return value checking conditions have
also been modified appropriately.
Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
---
drivers/usb/misc/lvstest.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/misc/lvstest.c b/drivers/usb/misc/lvstest.c
index f8686139d6f3..ab08483258d2 100644
--- a/drivers/usb/misc/lvstest.c
+++ b/drivers/usb/misc/lvstest.c
@@ -85,17 +85,17 @@ static void destroy_lvs_device(struct usb_device *udev)
static int lvs_rh_clear_port_feature(struct usb_device *hdev,
int port1, int feature)
{
- return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ return usb_control_msg_send(hdev, 0,
USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port1,
- NULL, 0, 1000);
+ NULL, 0, 1000, GFP_KERNEL);
}
static int lvs_rh_set_port_feature(struct usb_device *hdev,
int port1, int feature)
{
- return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ return usb_control_msg_send(hdev, 0,
USB_REQ_SET_FEATURE, USB_RT_PORT, feature, port1,
- NULL, 0, 1000);
+ NULL, 0, 1000, GFP_KERNEL);
}
static ssize_t u3_entry_store(struct device *dev,
@@ -271,10 +271,10 @@ static ssize_t get_dev_desc_store(struct device *dev,
goto free_desc;
}
- ret = usb_control_msg(udev, (PIPE_CONTROL << 30) | USB_DIR_IN,
- USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, USB_DT_DEVICE << 8,
- 0, descriptor, sizeof(*descriptor),
- USB_CTRL_GET_TIMEOUT);
+ ret = usb_control_msg_recv(udev, 0, USB_REQ_GET_DESCRIPTOR,
+ USB_DIR_IN, USB_DT_DEVICE << 8,
+ 0, descriptor, sizeof(*descriptor),
+ USB_CTRL_GET_TIMEOUT, GFP_KERNEL);
if (ret < 0)
dev_err(dev, "can't read device descriptor %d\n", ret);
@@ -336,10 +336,10 @@ static void lvs_rh_work(struct work_struct *work)
/* Examine each root port */
for (i = 1; i <= descriptor->bNbrPorts; i++) {
- ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
+ ret = usb_control_msg_recv(hdev, 0,
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, i,
- port_status, sizeof(*port_status), 1000);
- if (ret < 4)
+ port_status, sizeof(*port_status), 1000, GFP_KERNEL);
+ if (ret < 0)
continue;
portchange = le16_to_cpu(port_status->wPortChange);
@@ -420,13 +420,13 @@ static int lvs_rh_probe(struct usb_interface *intf,
usb_set_intfdata(intf, lvs);
/* how many number of ports this root hub has */
- ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
+ ret = usb_control_msg_recv(hdev, 0,
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
USB_DT_SS_HUB << 8, 0, &lvs->descriptor,
- USB_DT_SS_HUB_SIZE, USB_CTRL_GET_TIMEOUT);
- if (ret < (USB_DT_HUB_NONVAR_SIZE + 2)) {
+ USB_DT_SS_HUB_SIZE, USB_CTRL_GET_TIMEOUT, GFP_KERNEL);
+ if (ret < 0) {
dev_err(&hdev->dev, "wrong root hub descriptor read %d\n", ret);
- return ret < 0 ? ret : -EINVAL;
+ return ret;
}
/* submit urb to poll interrupt endpoint */
--
2.25.1
next prev parent reply other threads:[~2020-11-29 16:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-29 16:05 [PATCH 00/15] drivers: usb: misc: update to use usb_control_msg_{send|recv}() Anant Thazhemadam
2020-11-29 16:05 ` [PATCH 01/15] usb: misc: appledisplay: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2020-11-29 16:05 ` [PATCH 02/15] usb: misc: cypress_cy7c63: update to use usb_control_msg_recv() Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 03/15] usb: misc: cytherm: " Anant Thazhemadam
2020-11-29 16:16 ` Greg Kroah-Hartman
2020-11-29 16:38 ` Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 04/15] usb: misc: ehset: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2020-12-07 2:25 ` Peter Chen
2020-11-29 16:06 ` [PATCH 05/15] usb: misc: emi26: update to use usb_control_msg_send() Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 06/15] usb: misc: emi62: " Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 07/15] usb: misc: ezusb: " Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 08/15] usb: misc: idmouse: " Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 09/15] usb: misc: iowarrior: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 10/15] usb: misc: isight_firmware: update to use usb_control_msg_send() Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 11/15] usb: misc: ldusb: " Anant Thazhemadam
2020-11-29 16:06 ` Anant Thazhemadam [this message]
2020-11-29 16:06 ` [PATCH 13/15] usb: misc: trancevibrator: " Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 14/15] usb: misc: usbsevseg: " Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 15/15] usb: misc: usbtest: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
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=20201129160612.1908074-13-anant.thazhemadam@gmail.com \
--to=anant.thazhemadam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=novikov@ispras.ru \
/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).