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 02/14] Revert "Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv()"
Date: Wed, 23 Sep 2020 15:43:36 +0200 [thread overview]
Message-ID: <20200923134348.23862-3-oneukum@suse.com> (raw)
In-Reply-To: <20200923134348.23862-1-oneukum@suse.com>
This reverts commit e9b20f0fe17ab06c3b55153046209987749daa48.
The API has to be changed
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
drivers/bluetooth/ath3k.c | 90 +++++++++++++++++++++++++++++++++--------------
1 file changed, 64 insertions(+), 26 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 1472cccfd0b3..4ce270513695 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -212,16 +212,19 @@ static int ath3k_load_firmware(struct usb_device *udev,
BT_DBG("udev %p", udev);
+ pipe = usb_sndctrlpipe(udev, 0);
+
send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);
if (!send_buf) {
BT_ERR("Can't allocate memory chunk for firmware");
return -ENOMEM;
}
- err = usb_control_msg_send(udev, 0, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR,
- 0, 0, firmware->data, FW_HDR_SIZE,
- USB_CTRL_SET_TIMEOUT);
- if (err) {
+ memcpy(send_buf, firmware->data, FW_HDR_SIZE);
+ err = usb_control_msg(udev, pipe, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR,
+ 0, 0, send_buf, FW_HDR_SIZE,
+ USB_CTRL_SET_TIMEOUT);
+ if (err < 0) {
BT_ERR("Can't change to loading configuration err");
goto error;
}
@@ -256,17 +259,44 @@ static int ath3k_load_firmware(struct usb_device *udev,
static int ath3k_get_state(struct usb_device *udev, unsigned char *state)
{
- return usb_control_msg_recv(udev, 0, ATH3K_GETSTATE,
- USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
- state, 1, USB_CTRL_SET_TIMEOUT);
+ int ret, pipe = 0;
+ char *buf;
+
+ buf = kmalloc(sizeof(*buf), GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ pipe = usb_rcvctrlpipe(udev, 0);
+ ret = usb_control_msg(udev, pipe, ATH3K_GETSTATE,
+ USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
+ buf, sizeof(*buf), USB_CTRL_SET_TIMEOUT);
+
+ *state = *buf;
+ kfree(buf);
+
+ return ret;
}
static int ath3k_get_version(struct usb_device *udev,
struct ath3k_version *version)
{
- return usb_control_msg_recv(udev, 0, ATH3K_GETVERSION,
- USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
- version, sizeof(*version), USB_CTRL_SET_TIMEOUT);
+ int ret, pipe = 0;
+ struct ath3k_version *buf;
+ const int size = sizeof(*buf);
+
+ buf = kmalloc(size, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ pipe = usb_rcvctrlpipe(udev, 0);
+ ret = usb_control_msg(udev, pipe, ATH3K_GETVERSION,
+ USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
+ buf, size, USB_CTRL_SET_TIMEOUT);
+
+ memcpy(version, buf, size);
+ kfree(buf);
+
+ return ret;
}
static int ath3k_load_fwfile(struct usb_device *udev,
@@ -286,10 +316,13 @@ static int ath3k_load_fwfile(struct usb_device *udev,
}
size = min_t(uint, count, FW_HDR_SIZE);
+ memcpy(send_buf, firmware->data, size);
- ret = usb_control_msg_send(udev, 0, ATH3K_DNLOAD, USB_TYPE_VENDOR, 0, 0,
- firmware->data, size, USB_CTRL_SET_TIMEOUT);
- if (ret) {
+ pipe = usb_sndctrlpipe(udev, 0);
+ ret = usb_control_msg(udev, pipe, ATH3K_DNLOAD,
+ USB_TYPE_VENDOR, 0, 0, send_buf,
+ size, USB_CTRL_SET_TIMEOUT);
+ if (ret < 0) {
BT_ERR("Can't change to loading configuration err");
kfree(send_buf);
return ret;
@@ -322,19 +355,23 @@ static int ath3k_load_fwfile(struct usb_device *udev,
return 0;
}
-static void ath3k_switch_pid(struct usb_device *udev)
+static int ath3k_switch_pid(struct usb_device *udev)
{
- usb_control_msg_send(udev, 0, USB_REG_SWITCH_VID_PID, USB_TYPE_VENDOR,
- 0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+ int pipe = 0;
+
+ pipe = usb_sndctrlpipe(udev, 0);
+ return usb_control_msg(udev, pipe, USB_REG_SWITCH_VID_PID,
+ USB_TYPE_VENDOR, 0, 0,
+ NULL, 0, USB_CTRL_SET_TIMEOUT);
}
static int ath3k_set_normal_mode(struct usb_device *udev)
{
unsigned char fw_state;
- int ret;
+ int pipe = 0, ret;
ret = ath3k_get_state(udev, &fw_state);
- if (ret) {
+ if (ret < 0) {
BT_ERR("Can't get state to change to normal mode err");
return ret;
}
@@ -344,9 +381,10 @@ static int ath3k_set_normal_mode(struct usb_device *udev)
return 0;
}
- return usb_control_msg_send(udev, 0, ATH3K_SET_NORMAL_MODE,
- USB_TYPE_VENDOR, 0, 0, NULL, 0,
- USB_CTRL_SET_TIMEOUT);
+ pipe = usb_sndctrlpipe(udev, 0);
+ return usb_control_msg(udev, pipe, ATH3K_SET_NORMAL_MODE,
+ USB_TYPE_VENDOR, 0, 0,
+ NULL, 0, USB_CTRL_SET_TIMEOUT);
}
static int ath3k_load_patch(struct usb_device *udev)
@@ -359,7 +397,7 @@ static int ath3k_load_patch(struct usb_device *udev)
int ret;
ret = ath3k_get_state(udev, &fw_state);
- if (ret) {
+ if (ret < 0) {
BT_ERR("Can't get state to change to load ram patch err");
return ret;
}
@@ -370,7 +408,7 @@ static int ath3k_load_patch(struct usb_device *udev)
}
ret = ath3k_get_version(udev, &fw_version);
- if (ret) {
+ if (ret < 0) {
BT_ERR("Can't get version to change to load ram patch err");
return ret;
}
@@ -411,13 +449,13 @@ static int ath3k_load_syscfg(struct usb_device *udev)
int clk_value, ret;
ret = ath3k_get_state(udev, &fw_state);
- if (ret) {
+ if (ret < 0) {
BT_ERR("Can't get state to change to load configuration err");
return -EBUSY;
}
ret = ath3k_get_version(udev, &fw_version);
- if (ret) {
+ if (ret < 0) {
BT_ERR("Can't get version to change to load ram patch err");
return ret;
}
@@ -491,7 +529,7 @@ static int ath3k_probe(struct usb_interface *intf,
return ret;
}
ret = ath3k_set_normal_mode(udev);
- if (ret) {
+ if (ret < 0) {
BT_ERR("Set normal mode failed");
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 ` Oliver Neukum [this message]
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 ` [RFC 04/14] Revert "sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 05/14] Revert "sound: 6fire: " 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-3-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).