summaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-17 11:35:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-23 13:53:16 +0100
commite53e0342da4bd077ba3ef325685d7dd57fb8c4d1 (patch)
tree87cba9198700a45691f459bb040d5d7728fd1676 /drivers/usb/misc
parente0e9052034e34f2f7016197e27764f3587de87fe (diff)
downloadlinux-e53e0342da4bd077ba3ef325685d7dd57fb8c4d1.tar.bz2
USB: adutux: refactor endpoint retrieval
Use the new endpoint helpers to lookup the required interrupt-in and interrupt-out endpoints. Note that the descriptors are searched in reverse order to avoid any regressions. Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/adutux.c31
1 files changed, 8 insertions, 23 deletions
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 23fce40beab2..dfd54ea4808f 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -655,12 +655,10 @@ static int adu_probe(struct usb_interface *interface,
{
struct usb_device *udev = interface_to_usbdev(interface);
struct adu_device *dev = NULL;
- struct usb_host_interface *iface_desc;
- struct usb_endpoint_descriptor *endpoint;
int retval = -ENOMEM;
int in_end_size;
int out_end_size;
- int i;
+ int res;
/* allocate memory for our device state and initialize it */
dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL);
@@ -673,26 +671,13 @@ static int adu_probe(struct usb_interface *interface,
init_waitqueue_head(&dev->read_wait);
init_waitqueue_head(&dev->write_wait);
- iface_desc = &interface->altsetting[0];
-
- /* set up the endpoint information */
- for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
- endpoint = &iface_desc->endpoint[i].desc;
-
- if (usb_endpoint_is_int_in(endpoint))
- dev->interrupt_in_endpoint = endpoint;
-
- if (usb_endpoint_is_int_out(endpoint))
- dev->interrupt_out_endpoint = endpoint;
- }
- if (dev->interrupt_in_endpoint == NULL) {
- dev_err(&interface->dev, "interrupt in endpoint not found\n");
- retval = -ENODEV;
- goto error;
- }
- if (dev->interrupt_out_endpoint == NULL) {
- dev_err(&interface->dev, "interrupt out endpoint not found\n");
- retval = -ENODEV;
+ res = usb_find_common_endpoints_reverse(&interface->altsetting[0],
+ NULL, NULL,
+ &dev->interrupt_in_endpoint,
+ &dev->interrupt_out_endpoint);
+ if (res) {
+ dev_err(&interface->dev, "interrupt endpoints not found\n");
+ retval = res;
goto error;
}