From patchwork Tue Nov 11 14:52:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 5275251 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 76059C11AC for ; Tue, 11 Nov 2014 14:52:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A0DB2015D for ; Tue, 11 Nov 2014 14:52:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96E1920108 for ; Tue, 11 Nov 2014 14:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751496AbaKKOwW (ORCPT ); Tue, 11 Nov 2014 09:52:22 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:57388 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408AbaKKOwU (ORCPT ); Tue, 11 Nov 2014 09:52:20 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id sABEpoTD025014; Tue, 11 Nov 2014 08:51:50 -0600 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id sABEpn9a006061; Tue, 11 Nov 2014 08:51:50 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Tue, 11 Nov 2014 08:51:49 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id sABEpnTB013862; Tue, 11 Nov 2014 08:51:49 -0600 Date: Tue, 11 Nov 2014 08:52:17 -0600 From: Felipe Balbi To: Arnd Bergmann CC: Felipe Balbi , Antoine Tenart , Kishon Vijay Abraham I , Tony Lindgren , , , Subject: Re: [PATCH] usb: phy: fix twl4030 build regression Message-ID: <20141111145217.GB25615@saruman> Reply-To: References: <7831012.jlbEUURqIo@wuerfel> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <7831012.jlbEUURqIo@wuerfel> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, 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 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 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 ohci-omap.c. Fix the build breakage now. drivers/usb/host/ohci-omap.c: In function ‘start_hnp’: drivers/usb/host/ohci-omap.c:186:19: error: request for member ‘state’ in something not a structure or union hcd->usb_phy->otg.state = OTG_STATE_A_SUSPEND; Signed-off-by: Felipe Balbi diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index cf89b4b1..3e5df5a 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -183,7 +183,7 @@ static void start_hnp(struct ohci_hcd *ohci) otg_start_hnp(hcd->usb_phy->otg); local_irq_save(flags); - hcd->usb_phy->otg.state = OTG_STATE_A_SUSPEND; + hcd->usb_phy->otg->state = OTG_STATE_A_SUSPEND; writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]); l = omap_readl(OTG_CTRL); l &= ~OTG_A_BUSREQ;