From: Oliver Neukum <oneukum@suse.com>
To: himadrispandya@gmail.com, gregKH@linuxfoundation.org,
stern@rowland.harvard.edu, linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>
Subject: [RFC 04/14] Revert "sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv()"
Date: Wed, 23 Sep 2020 15:43:38 +0200 [thread overview]
Message-ID: <20200923134348.23862-5-oneukum@suse.com> (raw)
In-Reply-To: <20200923134348.23862-1-oneukum@suse.com>
This reverts commit f7ef7614f89e943d7511ee121b0b849f27b60cb2.
The API has to be changed.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
sound/usb/line6/driver.c | 69 ++++++++++++++++++++++++++++------------------
sound/usb/line6/podhd.c | 17 ++++++++----
sound/usb/line6/toneport.c | 8 +++---
3 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 601292c51491..60674ce4879b 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -337,18 +337,23 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
{
struct usb_device *usbdev = line6->usbdev;
int ret;
- u8 len;
+ unsigned char *len;
unsigned count;
if (address > 0xffff || datalen > 0xff)
return -EINVAL;
+ len = kmalloc(1, GFP_KERNEL);
+ if (!len)
+ return -ENOMEM;
+
/* query the serial number: */
- ret = usb_control_msg_send(usbdev, 0, 0x67,
- USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
- (datalen << 8) | 0x21, address, NULL, 0,
- LINE6_TIMEOUT * HZ);
- if (ret) {
+ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
+ USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+ (datalen << 8) | 0x21, address,
+ NULL, 0, LINE6_TIMEOUT * HZ);
+
+ if (ret < 0) {
dev_err(line6->ifcdev, "read request failed (error %d)\n", ret);
goto exit;
}
@@ -357,41 +362,45 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) {
mdelay(LINE6_READ_WRITE_STATUS_DELAY);
- ret = usb_control_msg_recv(usbdev, 0, 0x67,
- USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
- 0x0012, 0x0000, &len, 1,
- LINE6_TIMEOUT * HZ);
- if (ret) {
+ ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
+ USB_TYPE_VENDOR | USB_RECIP_DEVICE |
+ USB_DIR_IN,
+ 0x0012, 0x0000, len, 1,
+ LINE6_TIMEOUT * HZ);
+ if (ret < 0) {
dev_err(line6->ifcdev,
"receive length failed (error %d)\n", ret);
goto exit;
}
- if (len != 0xff)
+ if (*len != 0xff)
break;
}
ret = -EIO;
- if (len == 0xff) {
+ if (*len == 0xff) {
dev_err(line6->ifcdev, "read failed after %d retries\n",
count);
goto exit;
- } else if (len != datalen) {
+ } else if (*len != datalen) {
/* should be equal or something went wrong */
dev_err(line6->ifcdev,
"length mismatch (expected %d, got %d)\n",
- (int)datalen, len);
+ (int)datalen, (int)*len);
goto exit;
}
/* receive the result: */
- ret = usb_control_msg_recv(usbdev, 0, 0x67,
- USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
- 0x0013, 0x0000, data, datalen, LINE6_TIMEOUT * HZ);
- if (ret)
+ ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
+ USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
+ 0x0013, 0x0000, data, datalen,
+ LINE6_TIMEOUT * HZ);
+
+ if (ret < 0)
dev_err(line6->ifcdev, "read failed (error %d)\n", ret);
exit:
+ kfree(len);
return ret;
}
EXPORT_SYMBOL_GPL(line6_read_data);
@@ -414,10 +423,12 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
if (!status)
return -ENOMEM;
- ret = usb_control_msg_send(usbdev, 0, 0x67,
- USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
- 0x0022, address, data, datalen, LINE6_TIMEOUT * HZ);
- if (ret) {
+ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
+ USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+ 0x0022, address, data, datalen,
+ LINE6_TIMEOUT * HZ);
+
+ if (ret < 0) {
dev_err(line6->ifcdev,
"write request failed (error %d)\n", ret);
goto exit;
@@ -426,10 +437,14 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) {
mdelay(LINE6_READ_WRITE_STATUS_DELAY);
- ret = usb_control_msg_recv(usbdev, 0, 0x67,
- USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
- 0x0012, 0x0000, status, 1, LINE6_TIMEOUT * HZ);
- if (ret) {
+ ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
+ 0x67,
+ USB_TYPE_VENDOR | USB_RECIP_DEVICE |
+ USB_DIR_IN,
+ 0x0012, 0x0000,
+ status, 1, LINE6_TIMEOUT * HZ);
+
+ if (ret < 0) {
dev_err(line6->ifcdev,
"receiving status failed (error %d)\n", ret);
goto exit;
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index a1261f55d62b..eef45f7fef0d 100644
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -183,25 +183,29 @@ static const struct attribute_group podhd_dev_attr_group = {
static int podhd_dev_start(struct usb_line6_podhd *pod)
{
int ret;
- u8 init_bytes[8];
+ u8 *init_bytes;
int i;
struct usb_device *usbdev = pod->line6.usbdev;
- ret = usb_control_msg_send(usbdev, 0,
+ init_bytes = kmalloc(8, GFP_KERNEL);
+ if (!init_bytes)
+ return -ENOMEM;
+
+ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x11, 0,
NULL, 0, LINE6_TIMEOUT * HZ);
- if (ret) {
+ if (ret < 0) {
dev_err(pod->line6.ifcdev, "read request failed (error %d)\n", ret);
goto exit;
}
/* NOTE: looks like some kind of ping message */
- ret = usb_control_msg_recv(usbdev, 0, 0x67,
+ ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0x11, 0x0,
init_bytes, 3, LINE6_TIMEOUT * HZ);
- if (ret) {
+ if (ret < 0) {
dev_err(pod->line6.ifcdev,
"receive length failed (error %d)\n", ret);
goto exit;
@@ -216,12 +220,13 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)
goto exit;
}
- ret = usb_control_msg_send(usbdev, 0,
+ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
USB_REQ_SET_FEATURE,
USB_TYPE_STANDARD | USB_RECIP_DEVICE | USB_DIR_OUT,
1, 0,
NULL, 0, LINE6_TIMEOUT * HZ);
exit:
+ kfree(init_bytes);
return ret;
}
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index a9b56085b76a..94dd5e7ab2e6 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -126,11 +126,11 @@ static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2)
{
int ret;
- ret = usb_control_msg_send(usbdev, 0, 0x67,
- USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
- cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ);
+ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
+ USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+ cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ);
- if (ret) {
+ if (ret < 0) {
dev_err(&usbdev->dev, "send failed (error %d)\n", ret);
return ret;
}
--
2.16.4
next prev parent reply other threads:[~2020-09-23 13:44 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 13:43 [RFC] change the new message to provide for memory allocations Oliver Neukum
2020-09-23 13:43 ` [RFC 01/14] Revert "USB: core: hub.c: use usb_control_msg_send() in a few places" Oliver Neukum
2020-09-23 13:43 ` [RFC 02/14] Revert "Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 03/14] Revert "sound: hiface: move to use usb_control_msg_send()" Oliver Neukum
2020-09-23 13:43 ` Oliver Neukum [this message]
2020-09-23 13:43 ` [RFC 05/14] Revert "sound: 6fire: move to use usb_control_msg_send() and usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 06/14] Revert "sound: usx2y: move to use usb_control_msg_send()" Oliver Neukum
2020-09-23 13:43 ` [RFC 07/14] Revert "USB: legousbtower: use usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 08/14] USB: correct API of usb_control_msg_send/recv Oliver Neukum
2020-09-25 9:31 ` [PATCH 0/2] [usb] Petko Manolov
2020-09-25 9:31 ` [PATCH 1/2] net: pegasus: convert control messages to the new send/recv scheme Petko Manolov
2020-09-25 14:37 ` Greg KH
2020-09-25 16:01 ` [PATCH 0/2] [patch v2] utilize the new control message send and receive API Petko Manolov
2020-09-25 16:01 ` [PATCH 1/2] net: pegasus: convert control messages to the new send/recv scheme Petko Manolov
2020-09-26 5:44 ` Greg KH
2020-09-26 8:21 ` Petko Manolov
2020-09-26 12:45 ` Greg KH
2020-09-25 16:02 ` [PATCH 2/2] net: rtl8150: " Petko Manolov
2020-09-25 20:14 ` kernel test robot
2020-09-25 16:05 ` [PATCH 1/2] net: pegasus: " Petko Manolov
2020-09-26 5:45 ` Greg KH
2020-09-25 9:31 ` [PATCH 2/2] net: rtl8150: " Petko Manolov
2020-09-25 14:37 ` Greg KH
2020-09-26 9:13 ` [PATCH v3 0/2] Use the new usb control message API Petko Manolov
2020-09-26 9:13 ` [PATCH v3 1/2] net: pegasus: " Petko Manolov
2020-09-26 9:13 ` [PATCH v3 2/2] net: rtl8150: " Petko Manolov
2020-09-27 10:16 ` [PATCH v3 0/2] " Greg KH
2020-09-27 12:56 ` Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND " Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND v3 1/2] net: pegasus: " Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND v3 2/2] net: rtl8150: " Petko Manolov
2020-09-28 23:00 ` [PATCH RESEND v3 0/2] " David Miller
2020-09-29 4:59 ` Petko Manolov
2020-09-29 19:58 ` David Miller
2020-09-30 6:23 ` Greg KH
2020-09-23 13:43 ` [RFC 09/14] sound: usx2y: move to use usb_control_msg_send() Oliver Neukum
2020-09-25 14:32 ` Greg KH
2020-09-23 13:43 ` [RFC 10/14] sound: 6fire: move to use usb_control_msg_send() and usb_control_msg_recv() Oliver Neukum
2020-09-23 13:43 ` [RFC 11/14] USB: legousbtower: use usb_control_msg_recv() Oliver Neukum
2020-09-23 13:43 ` [RFC 12/14] sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv() Oliver Neukum
2020-09-23 13:43 ` [RFC 13/14] sound: hiface: move to use usb_control_msg_send() Oliver Neukum
2020-09-23 13:43 ` [RFC 14/14] Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv() Oliver Neukum
2020-09-23 17:21 ` [RFC] change the new message to provide for memory allocations Greg KH
2020-09-23 17:32 ` Oliver Neukum
2020-09-23 17:46 ` Greg KH
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=20200923134348.23862-5-oneukum@suse.com \
--to=oneukum@suse.com \
--cc=gregKH@linuxfoundation.org \
--cc=himadrispandya@gmail.com \
--cc=linux-usb@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/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).