USB: cdc-acm: refactor endpoint retrieval

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

Note that there is already a check verifying that there are exactly
three endpoints so we'd still be bailing out if there's an unexpected
endpoint type.

Cc: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index d5388938bc7aaf56accce547046429eaf4fe419e..00d55ba8983f9f5f1762850532842c83d3168660 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1174,6 +1174,7 @@ static int acm_probe(struct usb_interface *intf,
        int combined_interfaces = 0;
        struct device *tty_dev;
        int rv = -ENOMEM;
+       int res;
 
        /* normal quirks */
        quirks = (unsigned long)id->driver_info;
@@ -1274,23 +1275,12 @@ static int acm_probe(struct usb_interface *intf,
                        return -EINVAL;
                }
 look_for_collapsed_interface:
-               for (i = 0; i < 3; i++) {
-                       struct usb_endpoint_descriptor *ep;
-                       ep = &data_interface->cur_altsetting->endpoint[i].desc;
-
-                       if (usb_endpoint_is_int_in(ep))
-                               epctrl = ep;
-                       else if (usb_endpoint_is_bulk_out(ep))
-                               epwrite = ep;
-                       else if (usb_endpoint_is_bulk_in(ep))
-                               epread = ep;
-                       else
-                               return -EINVAL;
-               }
-               if (!epctrl || !epread || !epwrite)
-                       return -ENODEV;
-               else
-                       goto made_compressed_probe;
+               res = usb_find_common_endpoints(data_interface->cur_altsetting,
+                               &epread, &epwrite, &epctrl, NULL);
+               if (res)
+                       return res;
+
+               goto made_compressed_probe;
        }
 
 skip_normal_probe: