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: 40579 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2FCF7218DE for ; Tue, 11 Nov 2014 14:52:31 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id x13sf5388637wgg.1 for ; Tue, 11 Nov 2014 06:52:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:cc:subject:message-id :reply-to:references:mime-version:content-type:content-disposition :in-reply-to:user-agent:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=kWj77HKTfW0ehrBevLdRiAqgI3nEXhERJ6S/hnBjjpE=; b=TRCa7VT1TGNyYTEplzLOaEi1Y3HyRMbaD/m5ILvMLX/NEIZsDh4mS+1OrHBw/zUkxY 85dtjceWELVEDHY3S289BCzIAZOJ3oJEXFUG8NMU2pw/QJuFRnsa8V7rw/cIk3muoQgn LFNZ4fluIM1JjFB0aHTqI738uGB7yifoNC0Kyya3Nl7PBBwc1PwKZ6h4ZNRH45epzsli JuyWRaDcacp1YswPUmqnZVN10QIF7zO0Hs2HJ9NgCHzCauxj4AaPLDPZlt/6Lec+fwF8 T7B/ISyNZFbk3jL1R6jbeqgT68jh4iFW2WyEfJvrWJZzmzymei+7Gjx2dLZnQtXa7Abw FaNA== X-Gm-Message-State: ALoCoQkD1u6rlADQ3CYhjisBYumHXMcNKMPbE42KghF3Ch4jqOAnjFg4aoOl9Mq5DmrGpDYwpP4W X-Received: by 10.152.246.40 with SMTP id xt8mr4986670lac.0.1415717550426; Tue, 11 Nov 2014 06:52:30 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.80 with SMTP id be16ls466839lab.97.gmail; Tue, 11 Nov 2014 06:52:30 -0800 (PST) X-Received: by 10.152.87.171 with SMTP id az11mr35806895lab.37.1415717550279; Tue, 11 Nov 2014 06:52:30 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id u2si8881576lau.57.2014.11.11.06.52.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 06:52:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id mc6so9798629lab.12 for ; Tue, 11 Nov 2014 06:52:30 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr36024398laz.27.1415717549980; Tue, 11 Nov 2014 06:52:29 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp267474lbc; Tue, 11 Nov 2014 06:52:28 -0800 (PST) X-Received: by 10.70.33.1 with SMTP id n1mr7073148pdi.12.1415717547260; Tue, 11 Nov 2014 06:52:27 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uw6si20142032pbc.149.2014.11.11.06.52.26 for ; Tue, 11 Nov 2014 06:52:27 -0800 (PST) Received-SPF: none (google.com: linux-usb-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751541AbaKKOwW (ORCPT + 3 others); 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-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;