p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

USB: usbtmc: refactor endpoint retrieval 

Use the new endpoint helpers to lookup the required bulk-in and bulk-out
endpoints, and the optional interrupt-in endpoint.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2017-03-28 10:33:16 +02:00 committed by Greg Kroah-Hartman
parent 175f88a374
commit 041370cce8
1 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/usb/class/usbtmc.c
View File

@ -1375,7 +1375,7 @@ static int usbtmc_probe(struct usb_interface *intf,
{ {
struct usbtmc_device_data *data; struct usbtmc_device_data *data;
struct usb_host_interface *iface_desc; struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *bulk_in, *bulk_out, *int_in;
int n; int n;
int retcode; int retcode;
@ -1421,49 +1421,29 @@ static int usbtmc_probe(struct usb_interface *intf,
iface_desc = data->intf->cur_altsetting; iface_desc = data->intf->cur_altsetting;
data->ifnum = iface_desc->desc.bInterfaceNumber; data->ifnum = iface_desc->desc.bInterfaceNumber;
/* Find bulk in endpoint */ /* Find bulk endpoints */
for (n = 0; n < iface_desc->desc.bNumEndpoints; n++) { retcode = usb_find_common_endpoints(iface_desc,
endpoint = &iface_desc->endpoint[n].desc; &bulk_in, &bulk_out, NULL, NULL);
if (retcode) {
if (usb_endpoint_is_bulk_in(endpoint)) {
data->bulk_in = endpoint->bEndpointAddress;
dev_dbg(&intf->dev, "Found bulk in endpoint at %u\n",
data->bulk_in);
break;
}
}
/* Find bulk out endpoint */
for (n = 0; n < iface_desc->desc.bNumEndpoints; n++) {
endpoint = &iface_desc->endpoint[n].desc;
if (usb_endpoint_is_bulk_out(endpoint)) {
data->bulk_out = endpoint->bEndpointAddress;
dev_dbg(&intf->dev, "Found Bulk out endpoint at %u\n",
data->bulk_out);
break;
}
}
if (!data->bulk_out || !data->bulk_in) {
dev_err(&intf->dev, "bulk endpoints not found\n"); dev_err(&intf->dev, "bulk endpoints not found\n");
retcode = -ENODEV;
goto err_put; goto err_put;
} }
/* Find int endpoint */ data->bulk_in = bulk_in->bEndpointAddress;
for (n = 0; n < iface_desc->desc.bNumEndpoints; n++) { dev_dbg(&intf->dev, "Found bulk in endpoint at %u\n", data->bulk_in);
endpoint = &iface_desc->endpoint[n].desc;
if (usb_endpoint_is_int_in(endpoint)) { data->bulk_out = bulk_out->bEndpointAddress;
data->iin_ep_present = 1; dev_dbg(&intf->dev, "Found Bulk out endpoint at %u\n", data->bulk_out);
data->iin_ep = endpoint->bEndpointAddress;
data->iin_wMaxPacketSize = usb_endpoint_maxp(endpoint); /* Find int endpoint */
data->iin_interval = endpoint->bInterval; retcode = usb_find_int_in_endpoint(iface_desc, &int_in);
dev_dbg(&intf->dev, "Found Int in endpoint at %u\n", if (!retcode) {
data->iin_ep_present = 1;
data->iin_ep = int_in->bEndpointAddress;
data->iin_wMaxPacketSize = usb_endpoint_maxp(int_in);
data->iin_interval = int_in->bInterval;
dev_dbg(&intf->dev, "Found Int in endpoint at %u\n",
data->iin_ep); data->iin_ep);
break;
}
} }
retcode = get_capabilities(data); retcode = get_capabilities(data);