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: 40580 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 682BD218DE for ; Tue, 11 Nov 2014 14:53:16 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id b13sf5380036wgh.2 for ; Tue, 11 Nov 2014 06:53:15 -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=ZcrgEWJJfbeBXNlcuYFs+588pOGf7UdFR47Rgvsvwwk=; b=QWJw784KIiqLmdtHl9GWG+VSAOgaS0mdDr8OBtvDF8dijDvg5fXu4MJVeN/l1WVKyJ CUfPHCABaNHeIBeSpSmT+XpNNDDyfFBhXCl7mAyCZ5bvS48UoYJKHu8k9TJfevAoYYyR 5GTBphGw67gzlvPXfTOvayESsE5bGL1QX8gHT7MvK8uWGcSyiUjXhY+3aip1BIBVBgx1 6dIUSsMZhnmomzn7xs8aXdxD56jyc2P3sONxztBFA7sqwFPfEgMRGpyijnyU1WJN8P0V rqvJUx+Y31GTJFthHdTCgw5Uz4cgXiMiauHymrxgrYx2mihXA95MMrMmtNTFyDRU7jwe 686g== X-Gm-Message-State: ALoCoQmhhGFlEAT0TfAJk7DMYSpx3wgNbwakMGe8pdukE+1POpiUTcQ5l2aAWfYzjjcWVqhKK5Zl X-Received: by 10.180.76.168 with SMTP id l8mr2267044wiw.1.1415717595722; Tue, 11 Nov 2014 06:53:15 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.166 with SMTP id x6ls574459lal.93.gmail; Tue, 11 Nov 2014 06:53:15 -0800 (PST) X-Received: by 10.112.11.201 with SMTP id s9mr9844495lbb.79.1415717595371; Tue, 11 Nov 2014 06:53:15 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id jc4si31528061lbc.137.2014.11.11.06.53.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 06:53:15 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id ge10so9560270lab.22 for ; Tue, 11 Nov 2014 06:53:15 -0800 (PST) X-Received: by 10.152.120.199 with SMTP id le7mr35970806lab.67.1415717595287; Tue, 11 Nov 2014 06:53:15 -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 ew9csp267619lbc; Tue, 11 Nov 2014 06:53:14 -0800 (PST) X-Received: by 10.68.138.196 with SMTP id qs4mr41082213pbb.39.1415717592517; Tue, 11 Nov 2014 06:53:12 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qe5si20345382pdb.2.2014.11.11.06.53.11 for ; Tue, 11 Nov 2014 06:53:12 -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 S1752180AbaKKOxG (ORCPT + 3 others); Tue, 11 Nov 2014 09:53:06 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:45092 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752015AbaKKOxE (ORCPT ); Tue, 11 Nov 2014 09:53:04 -0500 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 CC: Arnd Bergmann , Antoine Tenart , Kishon Vijay Abraham I , Tony Lindgren , , , Subject: Re: [PATCH] usb: phy: fix twl4030 build regression Message-ID: <20141111145301.GC25615@saruman> Reply-To: References: <7831012.jlbEUURqIo@wuerfel> <20141111145217.GB25615@saruman> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20141111145217.GB25615@saruman> 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.49 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 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;