Revert "sound: 6fire: move to use usb_control_msg_send() and usb_control_msg_recv()"
This reverts commit aea67cc141
.
The API has to be changed.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20200923134348.23862-6-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ec4ed7dc58
commit
8cc4c2ed6a
@ -158,17 +158,29 @@ static int usb6fire_fw_ihex_init(const struct firmware *fw,
|
||||
static int usb6fire_fw_ezusb_write(struct usb_device *device,
|
||||
int type, int value, char *data, int len)
|
||||
{
|
||||
return usb_control_msg_send(device, 0, type,
|
||||
int ret;
|
||||
|
||||
ret = usb_control_msg(device, usb_sndctrlpipe(device, 0), type,
|
||||
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
||||
value, 0, data, len, HZ);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
else if (ret != len)
|
||||
return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int usb6fire_fw_ezusb_read(struct usb_device *device,
|
||||
int type, int value, char *data, int len)
|
||||
{
|
||||
return usb_control_msg_recv(device, 0, type,
|
||||
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
||||
value, 0, data, len, HZ);
|
||||
int ret = usb_control_msg(device, usb_rcvctrlpipe(device, 0), type,
|
||||
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, value,
|
||||
0, data, len, HZ);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
else if (ret != len)
|
||||
return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int usb6fire_fw_fpga_write(struct usb_device *device,
|
||||
@ -218,7 +230,7 @@ static int usb6fire_fw_ezusb_upload(
|
||||
/* upload firmware image */
|
||||
data = 0x01; /* stop ezusb cpu */
|
||||
ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
kfree(rec);
|
||||
release_firmware(fw);
|
||||
dev_err(&intf->dev,
|
||||
@ -230,7 +242,7 @@ static int usb6fire_fw_ezusb_upload(
|
||||
while (usb6fire_fw_ihex_next_record(rec)) { /* write firmware */
|
||||
ret = usb6fire_fw_ezusb_write(device, 0xa0, rec->address,
|
||||
rec->data, rec->len);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
kfree(rec);
|
||||
release_firmware(fw);
|
||||
dev_err(&intf->dev,
|
||||
@ -245,7 +257,7 @@ static int usb6fire_fw_ezusb_upload(
|
||||
if (postdata) { /* write data after firmware has been uploaded */
|
||||
ret = usb6fire_fw_ezusb_write(device, 0xa0, postaddr,
|
||||
postdata, postlen);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
dev_err(&intf->dev,
|
||||
"unable to upload ezusb firmware %s: post urb.\n",
|
||||
fwname);
|
||||
@ -255,7 +267,7 @@ static int usb6fire_fw_ezusb_upload(
|
||||
|
||||
data = 0x00; /* resume ezusb cpu */
|
||||
ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
dev_err(&intf->dev,
|
||||
"unable to upload ezusb firmware %s: end message.\n",
|
||||
fwname);
|
||||
@ -290,7 +302,7 @@ static int usb6fire_fw_fpga_upload(
|
||||
end = fw->data + fw->size;
|
||||
|
||||
ret = usb6fire_fw_ezusb_write(device, 8, 0, NULL, 0);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
kfree(buffer);
|
||||
release_firmware(fw);
|
||||
dev_err(&intf->dev,
|
||||
@ -315,7 +327,7 @@ static int usb6fire_fw_fpga_upload(
|
||||
kfree(buffer);
|
||||
|
||||
ret = usb6fire_fw_ezusb_write(device, 9, 0, NULL, 0);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
dev_err(&intf->dev,
|
||||
"unable to upload fpga firmware: end urb.\n");
|
||||
return ret;
|
||||
@ -351,7 +363,7 @@ int usb6fire_fw_init(struct usb_interface *intf)
|
||||
u8 buffer[12];
|
||||
|
||||
ret = usb6fire_fw_ezusb_read(device, 1, 0, buffer, 8);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
dev_err(&intf->dev,
|
||||
"unable to receive device firmware state.\n");
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user