From: Peter Chen <peter.chen@nxp.com>
To: Anant Thazhemadam <anant.thazhemadam@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>, Bin Liu <b-liu@ti.com>
Cc: "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-mediatek@lists.infradead.org"
<linux-mediatek@lists.infradead.org>
Subject: RE: [PATCH 04/15] usb: misc: ehset: update to use the usb_control_msg_{send|recv}() API
Date: Mon, 7 Dec 2020 02:25:37 +0000 [thread overview]
Message-ID: <DBBPR04MB7979E6ADD92EA2E8B840B7B48BCE0@DBBPR04MB7979.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20201129160612.1908074-5-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}() appropriately.
>
> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Peter
> ---
> drivers/usb/misc/ehset.c | 70 ++++++++++++++++++----------------------
> 1 file changed, 31 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/usb/misc/ehset.c b/drivers/usb/misc/ehset.c index
> 2752e1f4f4d0..068f4fae2965 100644
> --- a/drivers/usb/misc/ehset.c
> +++ b/drivers/usb/misc/ehset.c
> @@ -30,48 +30,42 @@ static int ehset_probe(struct usb_interface *intf,
>
> switch (test_pid) {
> case TEST_SE0_NAK_PID:
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_SET_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_TEST,
> - (USB_TEST_SE0_NAK << 8) | portnum,
> - NULL, 0, 1000);
> + ret = usb_control_msg_send(hub_udev, 0, USB_REQ_SET_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_TEST,
> + (USB_TEST_SE0_NAK << 8) | portnum,
> + NULL, 0, 1000, GFP_KERNEL);
> break;
> case TEST_J_PID:
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_SET_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_TEST,
> - (USB_TEST_J << 8) | portnum,
> - NULL, 0, 1000);
> + ret = usb_control_msg_send(hub_udev, 0, USB_REQ_SET_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_TEST,
> + (USB_TEST_J << 8) | portnum, NULL, 0,
> + 1000, GFP_KERNEL);
> break;
> case TEST_K_PID:
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_SET_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_TEST,
> - (USB_TEST_K << 8) | portnum,
> - NULL, 0, 1000);
> + ret = usb_control_msg_send(hub_udev, 0, USB_REQ_SET_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_TEST,
> + (USB_TEST_K << 8) | portnum, NULL, 0,
> + 1000, GFP_KERNEL);
> break;
> case TEST_PACKET_PID:
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_SET_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_TEST,
> - (USB_TEST_PACKET << 8) | portnum,
> - NULL, 0, 1000);
> + ret = usb_control_msg_send(hub_udev, 0, USB_REQ_SET_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_TEST,
> + (USB_TEST_PACKET << 8) | portnum,
> + NULL, 0, 1000, GFP_KERNEL);
> break;
> case TEST_HS_HOST_PORT_SUSPEND_RESUME:
> /* Test: wait for 15secs -> suspend -> 15secs delay -> resume */
> msleep(15 * 1000);
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_SET_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_SUSPEND, portnum,
> - NULL, 0, 1000);
> + ret = usb_control_msg_send(hub_udev, 0, USB_REQ_SET_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_SUSPEND,
> + portnum, NULL, 0, 1000, GFP_KERNEL);
> if (ret < 0)
> break;
>
> msleep(15 * 1000);
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_CLEAR_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_SUSPEND, portnum,
> - NULL, 0, 1000);
> + ret = usb_control_msg_send(hub_udev, 0,
> USB_REQ_CLEAR_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_SUSPEND,
> + portnum, NULL, 0, 1000, GFP_KERNEL);
> break;
> case TEST_SINGLE_STEP_GET_DEV_DESC:
> /* Test: wait for 15secs -> GetDescriptor request */ @@ -80,11
> +74,10 @@ static int ehset_probe(struct usb_interface *intf,
> if (!buf)
> return -ENOMEM;
>
> - ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
> - USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
> - USB_DT_DEVICE << 8, 0,
> - buf, USB_DT_DEVICE_SIZE,
> - USB_CTRL_GET_TIMEOUT);
> + ret = usb_control_msg_recv(dev, 0, USB_REQ_GET_DESCRIPTOR,
> + USB_DIR_IN, USB_DT_DEVICE << 8, 0,
> + buf, USB_DT_DEVICE_SIZE,
> + USB_CTRL_GET_TIMEOUT, GFP_KERNEL);
> kfree(buf);
> break;
> case TEST_SINGLE_STEP_SET_FEATURE:
> @@ -100,11 +93,10 @@ static int ehset_probe(struct usb_interface *intf,
> break;
> }
>
> - ret = usb_control_msg(hub_udev, usb_sndctrlpipe(hub_udev, 0),
> - USB_REQ_SET_FEATURE, USB_RT_PORT,
> - USB_PORT_FEAT_TEST,
> - (6 << 8) | portnum,
> - NULL, 0, 60 * 1000);
> + ret = usb_control_msg_send(hub_udev, 0, USB_REQ_SET_FEATURE,
> + USB_RT_PORT, USB_PORT_FEAT_TEST,
> + (6 << 8) | portnum, NULL, 0,
> + 60 * 1000, GFP_KERNEL);
>
> break;
> default:
> @@ -112,7 +104,7 @@ static int ehset_probe(struct usb_interface *intf,
> __func__, test_pid);
> }
>
> - return (ret < 0) ? ret : 0;
> + return ret;
> }
>
> static void ehset_disconnect(struct usb_interface *intf)
> --
> 2.25.1
next prev parent reply other threads:[~2020-12-07 2:26 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 [this message]
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 ` [PATCH 12/15] usb: misc: lvstest: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2020-11-29 16:06 ` [PATCH 13/15] usb: misc: trancevibrator: update to use usb_control_msg_send() 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=DBBPR04MB7979E6ADD92EA2E8B840B7B48BCE0@DBBPR04MB7979.eurprd04.prod.outlook.com \
--to=peter.chen@nxp.com \
--cc=anant.thazhemadam@gmail.com \
--cc=b-liu@ti.com \
--cc=chunfeng.yun@mediatek.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
/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).