From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756801AbcKBR7z (ORCPT ); Wed, 2 Nov 2016 13:59:55 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:34548 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756290AbcKBR7x (ORCPT ); Wed, 2 Nov 2016 13:59:53 -0400 Date: Wed, 2 Nov 2016 20:59:44 +0300 From: Eugene Korenevsky To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: Luiz Capitulino , Linus Torvalds , Chase Metzger , Greg Kroah-Hartman , Alan Stern , Mathias Nyman , Lu Baolu , Oliver Neukum , Hans Yang Subject: [PATCH v2] USB hub_probe: remove ugly goto-into-compound-statement Message-ID: <20161102175944.GA31229@vnote> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/usb/core/hub.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index cbb1467..4081672 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1802,23 +1802,21 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) /* 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: + + /* Reject in following cases: + * - Interface subclass is not 0 or 1 + * - Multiple endpoints + * - Not an interrupt in endpoint + */ + endpoint = &desc->endpoint[0].desc; + if ((desc->desc.bInterfaceSubClass != 0 && + desc->desc.bInterfaceSubClass != 1) || + desc->desc.bNumEndpoints != 1 || + !usb_endpoint_is_int_in(endpoint)) { 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"); -- 2.10.2