From 56090d78a799015adadde759ee5de9e7b292126a Mon Sep 17 00:00:00 2001 From: Liam Merwick Date: Wed, 6 Feb 2019 13:36:48 +0000 Subject: usb: rearrange usb_ep_get() There is no need to calculate the 'eps' variable in usb_ep_get() if 'ep' is the control endpoint. Instead the calculation should be done after validating the input before returning an entry indexed by the endpoint 'ep'. Signed-off-by: Liam Merwick Reviewed-by: Darren Kenny Reviewed-by: Mark Kanda Reviewed-by: Ameya More Message-id: 1549460216-25808-2-git-send-email-liam.merwick@oracle.com Signed-off-by: Gerd Hoffmann --- hw/usb/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/usb/core.c') diff --git a/hw/usb/core.c b/hw/usb/core.c index 241ae66b15..bfb7ae67bb 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -720,12 +720,12 @@ struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep) if (dev == NULL) { return NULL; } - eps = (pid == USB_TOKEN_IN) ? dev->ep_in : dev->ep_out; if (ep == 0) { return &dev->ep_ctl; } assert(pid == USB_TOKEN_IN || pid == USB_TOKEN_OUT); assert(ep > 0 && ep <= USB_MAX_ENDPOINTS); + eps = (pid == USB_TOKEN_IN) ? dev->ep_in : dev->ep_out; return eps + ep - 1; } -- cgit v1.2.3-55-g7522 From 7011baece29d0e197c54c4e57326ba88e67a4949 Mon Sep 17 00:00:00 2001 From: Liam Merwick Date: Wed, 6 Feb 2019 13:36:56 +0000 Subject: usb: remove unnecessary NULL device check from usb_ep_get() No caller of usb_ep_get() calls it with a NULL device (previous commits have addressed the few remaining cases which didn't explicitly check). Replace check for 'dev == NULL' with an assert instead. Signed-off-by: Liam Merwick Message-id: 1549460216-25808-10-git-send-email-liam.merwick@oracle.com Signed-off-by: Gerd Hoffmann --- hw/usb/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/usb/core.c') diff --git a/hw/usb/core.c b/hw/usb/core.c index bfb7ae67bb..8fbd9c7d57 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -717,9 +717,7 @@ struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep) { struct USBEndpoint *eps; - if (dev == NULL) { - return NULL; - } + assert(dev != NULL); if (ep == 0) { return &dev->ep_ctl; } -- cgit v1.2.3-55-g7522