USB hub_probe: rework ugly goto-into-compound-statement

Rework smelling code (goto inside compound statement). Perhaps this is
legacy. Anyway such code is not appropriate for Linux kernel.

Signed-off-by: Eugene Korenevsky <ekorenevsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 59e0418a5ed564fe470d1e8826e485872fceb312..6e6797d145dd80136c413129641bdbbae2f1e63b 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1661,10 +1661,28 @@ static void hub_disconnect(struct usb_interface *intf)
        kref_put(&hub->kref, hub_release);
 }
 
+static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
+{
+       /* Some hubs have a subclass of 1, which AFAICT according to the */
+       /*  specs is not defined, but it works */
+       if (desc->desc.bInterfaceSubClass != 0 &&
+           desc->desc.bInterfaceSubClass != 1)
+               return false;
+
+       /* Multiple endpoints? What kind of mutant ninja-hub is this? */
+       if (desc->desc.bNumEndpoints != 1)
+               return false;
+
+       /* If the first endpoint is not interrupt IN, we'd better punt! */
+       if (!usb_endpoint_is_int_in(&desc->endpoint[0].desc))
+               return false;
+
+        return true;
+}
+
 static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
        struct usb_host_interface *desc;
-       struct usb_endpoint_descriptor *endpoint;
        struct usb_device *hdev;
        struct usb_hub *hub;
 
@@ -1739,25 +1757,11 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
        }
 #endif
 
-       /* Some hubs have a subclass of 1, which AFAICT according to the */
-       /*  specs is not defined, but it works */
-       if ((desc->desc.bInterfaceSubClass != 0) &&
-           (desc->desc.bInterfaceSubClass != 1)) {
-descriptor_error:
+       if (!hub_descriptor_is_sane(desc)) {
                dev_err(&intf->dev, "bad descriptor, ignoring hub\n");
                return -EIO;
        }
 
-       /* Multiple endpoints? What kind of mutant ninja-hub is this? */
-       if (desc->desc.bNumEndpoints != 1)
-               goto descriptor_error;
-
-       endpoint = &desc->endpoint[0].desc;
-
-       /* If it's not an interrupt in endpoint, we'd better punt! */
-       if (!usb_endpoint_is_int_in(endpoint))
-               goto descriptor_error;
-
        /* We found a hub */
        dev_info(&intf->dev, "USB hub found\n");
 
@@ -1784,7 +1788,7 @@ descriptor_error:
        if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)
                hub->quirk_check_port_auto_suspend = 1;
 
-       if (hub_configure(hub, endpoint) >= 0)
+       if (hub_configure(hub, &desc->endpoint[0].desc) >= 0)
                return 0;
 
        hub_disconnect(intf);