From patchwork Tue Nov 11 14:53:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 5275321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8F5C99F2ED for ; Tue, 11 Nov 2014 14:55:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B052020155 for ; Tue, 11 Nov 2014 14:55:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9C1B20108 for ; Tue, 11 Nov 2014 14:55:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoCob-00063L-Po; Tue, 11 Nov 2014 14:53:05 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoCoY-0005mP-0y for linux-arm-kernel@lists.infradead.org; Tue, 11 Nov 2014 14:53:03 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id sABEqY9K015837; Tue, 11 Nov 2014 08:52:34 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id sABEqY4N006544; Tue, 11 Nov 2014 08:52:34 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Tue, 11 Nov 2014 08:52:33 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id sABEqXr0024218; Tue, 11 Nov 2014 08:52:33 -0600 Date: Tue, 11 Nov 2014 08:53:01 -0600 From: Felipe Balbi To: Felipe Balbi Subject: Re: [PATCH] usb: phy: fix twl4030 build regression Message-ID: <20141111145301.GC25615@saruman> References: <7831012.jlbEUURqIo@wuerfel> <20141111145217.GB25615@saruman> MIME-Version: 1.0 In-Reply-To: <20141111145217.GB25615@saruman> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141111_065302_279135_F17625E3 X-CRM114-Status: GOOD ( 15.55 ) X-Spam-Score: -5.6 (-----) Cc: Arnd Bergmann , Tony Lindgren , Antoine Tenart , linux-usb@vger.kernel.org, Kishon Vijay Abraham I , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: balbi@ti.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Nov 11, 2014 at 08:52:17AM -0600, Felipe Balbi wrote: > On Tue, Nov 11, 2014 at 10:36:09AM +0100, Arnd Bergmann wrote: > > Recent changes to the common OTG handling broke building the twl4030 > > OTG driver as found during an allmodconfig build of linux-next: > > > > drivers/phy/phy-twl4030-usb.c: In function 'twl4030_set_peripheral': > > drivers/phy/phy-twl4030-usb.c:609:11: error: 'struct phy' has no member named 'state' > > drivers/phy/phy-twl4030-usb.c: In function 'twl4030_usb_probe': > > drivers/phy/phy-twl4030-usb.c:679:12: warning: assignment from incompatible pointer type > > > > This applies the same changes that were done to the other phy drivers > > to get it to build cleanly. > > > > Signed-off-by: Arnd Bergmann > > Fixes: 19c1eac2685b6 ("usb: rename phy to usb_phy in OTG") > > Fixes: e47d92545c297 ("usb: move the OTG state from the USB PHY to the OTG structure") > > on my testing/next already: > > commit 7e1bbeb4292783dcc079156b8fa08d66d17219e0 > Author: Felipe Balbi > Date: Fri Nov 7 19:43:45 2014 -0600 > > usb: host: ohci: omap: fix build breakage wrong commit, here's the correct one: commit 8b9ca2767b2d1ea405287e530da3a7b234120b95 Author: Felipe Balbi Date: Fri Nov 7 09:06:04 2014 -0600 phy: twl4030: Fix build breakage commit e47d925 (usb: move the OTG state from the USB PHY to the OTG structure) moved the OTG state field from struct usb_phy to struct usb_otg but, even though I fixed many other build breakages, I still missed one on phy-twl4030-usb.c. Fix the build breakage now. While at that, also a build warning introduced by the same commit. Cc: Kishon Vijay Abraham I Cc: Antoine Tenart Signed-off-by: Felipe Balbi diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c index 7b04bef..e2698d29 100644 --- a/drivers/phy/phy-twl4030-usb.c +++ b/drivers/phy/phy-twl4030-usb.c @@ -606,7 +606,7 @@ static int twl4030_set_peripheral(struct usb_otg *otg, otg->gadget = gadget; if (!gadget) - otg->phy->state = OTG_STATE_UNDEFINED; + otg->state = OTG_STATE_UNDEFINED; return 0; } @@ -618,7 +618,7 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host) otg->host = host; if (!host) - otg->phy->state = OTG_STATE_UNDEFINED; + otg->state = OTG_STATE_UNDEFINED; return 0; } @@ -676,7 +676,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) twl->phy.otg = otg; twl->phy.type = USB_PHY_TYPE_USB2; - otg->phy = &twl->phy; + otg->usb_phy = &twl->phy; otg->set_host = twl4030_set_host; otg->set_peripheral = twl4030_set_peripheral;