From patchwork Sun Dec 8 23:57:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1205784 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="lRG95riD"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47WNYF3GVtz9sPW for ; Mon, 9 Dec 2019 10:57:37 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C21A480661; Mon, 9 Dec 2019 00:57:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="lRG95riD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D0D10815F1; Mon, 9 Dec 2019 00:57:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 38501803C3 for ; Mon, 9 Dec 2019 00:57:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x144.google.com with SMTP id u17so11176870ilq.5 for ; Sun, 08 Dec 2019 15:57:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6bxdjy/LcajQPpZkjiuNMRptAMSznvPDGi9dVzQGXA4=; b=lRG95riDyoTq9i7VVqW/acB9gZ2Hnv+CJMg2JWANCT4fr7JKGxpAT+ill9EUV/DhzT 9WKItJFDCLr7oa3Z84uz8ETpHycf7PGQmoVA8nSicLKDXjazz0cUliny1cvGtwqvtSWN g226NwL/JjVLw5+bUWtVFrDP7jyJ/+/OSntkk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6bxdjy/LcajQPpZkjiuNMRptAMSznvPDGi9dVzQGXA4=; b=Osd5sFU9TbHndx86y1uY32m4ylQnN/1wiKDwfdPTtARSbxvvYZb8p59SB7OMYMPzgg AN1SfGCx0sLk7wB1p4ZZ91aKnjwqIskQDvDOG843JYSGxLf+esIJZTRi7jwySjg14QBb mZhORBCFBVoNBcbzg0F1T0jJqfos77tcDJE4NGaLXiW/xm9YmOC96dldQJQnJnl/BKBo BokezH2glgxFymyKpJj/eRdfg1Q60gjs1FAZJh145OmHwuoqj+GR7aasz0rbSPlct6Dd TPzIv6VhVDp4ayYntWcxHNnGNoVyc8Ynzfx1geogVQHiqG9Q9bXKng6ULlqjqgsBgkvA rRCg== X-Gm-Message-State: APjAAAWjldEx2xA8/vFssxMTdJ1+kpHfz+5JurDaf+yJClnvgEgWGZhY fnvs/ypZG43SwdZQhrRnzScVF+raEf4= X-Google-Smtp-Source: APXvYqwOaCnQ0NjNE4MIe9L8bZMb8N8w9LnyhJkzdla4Le6ggS84xo7+LPzDZyi8/pVE+CU0OoXJkw== X-Received: by 2002:a92:81cb:: with SMTP id q72mr25816077ilk.275.1575849441678; Sun, 08 Dec 2019 15:57:21 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id v7sm5160597iom.58.2019.12.08.15.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2019 15:57:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH] usb: musb-new: Drop use of BUG() Date: Sun, 8 Dec 2019 16:57:17 -0700 Message-Id: <20191208165714.1.I612ef46166caaad0422784ae7f207ba7d9b56886@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Tom Rini , Remy Bohmer Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean These macros use __FILE__ which inserts the full path of the object file into U-Boot, thus increasing file size. Drop these usages. Signed-off-by: Simon Glass --- drivers/usb/musb-new/musb_core.c | 6 ++++++ drivers/usb/musb-new/musb_gadget_ep0.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index afea9fbcef..238e4708a5 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -1859,7 +1859,13 @@ allocate_instance(struct device *dev, musb->ctrl_base = mbase; musb->nIrq = -ENODEV; musb->config = config; +#ifdef __UBOOT__ + assert(musb->config->num_eps <= MUSB_C_NUM_EPS); + if (musb->config->num_eps > MUSB_C_NUM_EPS) + return NULL; +#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++) { diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c index 9835a2e2bf..3adabcb69f 100644 --- a/drivers/usb/musb-new/musb_gadget_ep0.c +++ b/drivers/usb/musb-new/musb_gadget_ep0.c @@ -882,7 +882,9 @@ finish: default: /* "can't happen" */ - WARN_ON(1); + /* WARN_ON(1); (disable since __FILE__ can be large) */ + dev_dbg(musb->controller, "odd; unknown state %d\n", + musb->ep0_state); musb_writew(regs, MUSB_CSR0, MUSB_CSR0_P_SENDSTALL); musb->ep0_state = MUSB_EP0_STAGE_IDLE; break;