From patchwork Tue May 28 02:22:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1106019 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bPXUT5mI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45Cd026wLfz9s3l for ; Tue, 28 May 2019 12:22:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 810ACC22075; Tue, 28 May 2019 02:22:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4CE83C21C4A; Tue, 28 May 2019 02:22:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 34F3CC21C4A; Tue, 28 May 2019 02:22:05 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id B0CE0C21C3F for ; Tue, 28 May 2019 02:22:04 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id g16so14482532iom.9 for ; Mon, 27 May 2019 19:22:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=9twlOcYGge0/JW0JvLNp/FXfgNWG+Rr0tqPcG4xBPA4=; b=bPXUT5mITTz4VOlFgdXcqQSoZtcX80ipjIEYmKRtdw845wDRS6gfJzGCIkefGzuzRd s//QoeACH3pQTLHQSamak/7HTjtA/7+DF4nSyPK95a/hmZC8aLgYiwWzVNzVLPQsT64Z lrww54r1nqwK2bdhFlrjkR4StHNdTknHu2DTPHWNMxk2npTSBWC3waB5S4FakVG39u+b /p70O8GMjoPagnpphZxr3r9w3ZwrGSrXS3v8LrP+C2WFd9nsmhlDqqu+1BVElm2AConv o9fPCTsbqYwaBSflXxFOqm81LAKEUGXuQkFB9yFmHXT/arg/8mSMGeGv0EecCO65tFea rDpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=9twlOcYGge0/JW0JvLNp/FXfgNWG+Rr0tqPcG4xBPA4=; b=DfeYnWSJI0VsmZhL+RG+75s6Fo3jUhXv+bOf5q3Aa21/0gY29hoFfFB9i2r2Uy/Cns 5p1tTcr/aannvCA9EZcqMprvUgpr9nTC8+E2P/jeh+SSPFTsuLHxu6eHVdGNklYj3xnm n874mc8Uxox1mKHVzrmCKryGmVj+sj5YrEjkme3rHUWGAM3HRCWkC/iwYn2O1DNQM2gT c0BePLkEpk8Vju8r/W+Dzr71PiM4JmKzudpT+Wz5HYTFqWvASEFdZZAVQw8gVBRrQ8ef CPK9TwFcEljHcs323EDTBZFHxq4ZsijoQpUv6/i7mlXNh8t+B8j/lZc9j7UxgmhAg9Sa oBxA== X-Gm-Message-State: APjAAAUZHlWtmKCHrZOjbOeQuTw558Tklrqze3P9NHG1zpRVUedxXZfb 2uLzwi/Pn5a+q79lqo2TRDDev47b X-Google-Smtp-Source: APXvYqxbymiBkVnSgmvrFaVKySehK2YmCR6n/XuqhI2G4Xd/T+40OHZmeIYubzXkzQsnINyQEY1QQQ== X-Received: by 2002:a6b:740a:: with SMTP id s10mr23844643iog.99.1559010123422; Mon, 27 May 2019 19:22:03 -0700 (PDT) Received: from ethiopia (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id l136sm737813itc.23.2019.05.27.19.22.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 27 May 2019 19:22:02 -0700 (PDT) Date: Mon, 27 May 2019 21:22:00 -0500 From: "Derald D. Woods" To: u-boot@lists.denx.de Message-ID: <20190528022200.GA14816@ethiopia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.12.0 (2019-05-25) Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 3/3] usb: musb-new: omap2430: Fix compilation warning with USB_MUSB_GADGET X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit addresses the following warning, when _NOT_ USB_MUSB_HOST: [...] CC drivers/usb/gadget/f_mass_storage.o CC drivers/usb/musb-new/omap2430.o CC drivers/usb/gadget/f_fastboot.o CC env/common.o CC env/env.o /src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c: In function ‘omap2430_musb_probe’: /src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c:239:6: warning: assignment to ‘int’ from ‘struct musb *’ makes integer from pointer without a cast [-Wint-conversion] ret = musb_register(&platdata->plat, ^ LD drivers/usb/host/built-in.o CC drivers/usb/gadget/f_sdp.o CC fs/ext4/ext4fs.o [...] Signed-off-by: Derald D. Woods --- drivers/usb/musb-new/omap2430.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 32743aa72c..cca1653f1e 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -215,11 +215,13 @@ static int omap2430_musb_probe(struct udevice *dev) { #ifdef CONFIG_USB_MUSB_HOST struct musb_host_data *host = dev_get_priv(dev); +#else + struct musb *musbp; #endif struct omap2430_musb_platdata *platdata = dev_get_platdata(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct omap_musb_board_data *otg_board_data; - int ret; + int ret = 0; void *base = dev_read_addr_ptr(dev); priv->desc_before_addr = true; @@ -236,9 +238,11 @@ static int omap2430_musb_probe(struct udevice *dev) ret = musb_lowlevel_init(host); #else - ret = musb_register(&platdata->plat, + musbp = musb_register(&platdata->plat, (struct device *)otg_board_data, platdata->base); + if (IS_ERR_OR_NULL(musbp)) + return -EINVAL; #endif return ret; }