USB hub_probe: rework ugly goto-into-compound-statement (c94dc34f) · Commits · 戴 / test

drivers/usb/core/hub.c

+21 −17

Original line number	Diff line number	Diff line
		@@ -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);

Admin message