diff options
| author | Boyan Karatotev <boyan.karatotev@arm.com> | 2022-11-22 14:09:36 +0000 |
|---|---|---|
| committer | Boyan Karatotev <boyan.karatotev@arm.com> | 2022-12-01 16:17:34 +0000 |
| commit | 02af589cfa8d8aefaffeef3390e3fb8fdf51978f (patch) | |
| tree | 388e50a00cc8e9f1ee0e8250a474b2331602fbbf | |
| parent | 9f58bfbbe90d2891c289cd27ab7d2ede8b5572d4 (diff) | |
| download | arm-trusted-firmware-02af589cfa8d8aefaffeef3390e3fb8fdf51978f.tar.gz | |
fix(st-usb): replace redundant checks with asserts
Returning enum usb_status in an enum usb_action function is wrong as
they have different meanings. However, usb_dwc2_ep0_out_start() and
usb_dwc2_activate_setup() only return USBD_OK so we will never get to
there. Replace these checks with asserts in case the code changes in
future.
This also silences a warning when compiling with -Wextra.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I73dfd5c189a357544c15ceb3f4268da82ce272b9
| -rw-r--r-- | drivers/st/usb/stm32mp1_usb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/st/usb/stm32mp1_usb.c b/drivers/st/usb/stm32mp1_usb.c index 9a4969036..78890f5eb 100644 --- a/drivers/st/usb/stm32mp1_usb.c +++ b/drivers/st/usb/stm32mp1_usb.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> #include <stdint.h> #include <arch_helpers.h> @@ -794,7 +795,7 @@ static enum usb_action usb_dwc2_it_handler(void *handle, uint32_t *param) uint32_t epint; uint32_t epnum; uint32_t temp; - enum usb_status ret; + enum usb_status __unused ret; if (usb_dwc2_get_mode(handle) != USB_OTG_MODE_DEVICE) { return USB_NOTHING; @@ -947,9 +948,7 @@ static enum usb_action usb_dwc2_it_handler(void *handle, uint32_t *param) /* Setup EP0 to receive SETUP packets */ ret = usb_dwc2_ep0_out_start(handle); - if (ret != USBD_OK) { - return ret; - } + assert(ret == USBD_OK); mmio_write_32(usb_base_addr + OTG_GINTSTS, OTG_GINTSTS_USBRST); @@ -959,9 +958,7 @@ static enum usb_action usb_dwc2_it_handler(void *handle, uint32_t *param) /* Handle enumeration done interrupt */ if ((usb_dwc2_read_int(handle) & OTG_GINTSTS_ENUMDNE) != 0U) { ret = usb_dwc2_activate_setup(handle); - if (ret != USBD_OK) { - return ret; - } + assert(ret == USBD_OK); mmio_clrbits_32(usb_base_addr + OTG_GUSBCFG, OTG_GUSBCFG_TRDT); |