usb: Drop use of BUG_ON() and WARN_ON()

These macros use __FILE__ which inserts the full path of the object file
into U-Boot, thus increasing file size. Drop these usages.

An older version of this patch was submitted here:

http://patchwork.ozlabs.org/patch/1205784/

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-29 21:19:12 -07:00
parent 6de16dbe44
commit 1058eec0f4
4 changed files with 13 additions and 1 deletions

View file

@ -1003,7 +1003,11 @@ static void composite_unbind(struct usb_gadget *gadget)
* so there's no i/o concurrency that could affect the
* state protected by cdev->lock.
*/
#ifdef __UBOOT__
assert_noisy(!cdev->config);
#else
BUG_ON(cdev->config);
#endif
while (!list_empty(&cdev->configs)) {
c = list_first_entry(&cdev->configs,

View file

@ -390,7 +390,11 @@ static inline int __fsg_is_set(struct fsg_common *common,
if (common->fsg)
return 1;
ERROR(common, "common->fsg is NULL in %s at %u\n", func, line);
#ifdef __UBOOT__
assert_noisy(false);
#else
WARN_ON(1);
#endif
return 0;
}

View file

@ -1859,7 +1859,11 @@ allocate_instance(struct device *dev,
musb->ctrl_base = mbase;
musb->nIrq = -ENODEV;
musb->config = config;
#ifdef __UBOOT__
assert_noisy(musb->config->num_eps <= MUSB_C_NUM_EPS);
#else
BUG_ON(musb->config->num_eps > MUSB_C_NUM_EPS);
#endif
for (epnum = 0, ep = musb->endpoints;
epnum < musb->config->num_eps;
epnum++, ep++) {

View file

@ -882,7 +882,7 @@ finish:
default:
/* "can't happen" */
WARN_ON(1);
assert_noisy(false);
musb_writew(regs, MUSB_CSR0, MUSB_CSR0_P_SENDSTALL);
musb->ep0_state = MUSB_EP0_STAGE_IDLE;
break;