From patchwork Tue Nov 11 09:36:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5271841 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 BF4C99F387 for ; Tue, 11 Nov 2014 09:39:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 007FA2013A for ; Tue, 11 Nov 2014 09:39:28 +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 21BF720136 for ; Tue, 11 Nov 2014 09:39:27 +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 1Xo7sb-0000Tq-Dl; Tue, 11 Nov 2014 09:36:53 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xo7sY-0000So-A1 for linux-arm-kernel@lists.infradead.org; Tue, 11 Nov 2014 09:36:51 +0000 Received: from wuerfel.localnet (HSI-KBW-149-172-15-242.hsi13.kabel-badenwuerttemberg.de [149.172.15.242]) by mrelayeu.kundenserver.de (node=mreue101) with ESMTP (Nemesis) id 0MGAYZ-1Xl7sM3otr-00FENV; Tue, 11 Nov 2014 10:36:10 +0100 From: Arnd Bergmann To: Felipe Balbi Subject: [PATCH] usb: phy: fix twl4030 build regression Date: Tue, 11 Nov 2014 10:36:09 +0100 Message-ID: <7831012.jlbEUURqIo@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:KgrJSYmSoI455qZWxT/t8xxsD+ULHeuIppYV7pT+Uhs 8RInO0fEOnngcmhQuFc4u7Ex0ZHUi5rwHXvGu9uSdFfwNGs5YF TMVJ6Cu8Nj6KJed9mUE2RK/sWOBQj8de1hkMz3gGfARKljBCWt ozRoKol0/NBidmp2zxFOjCqgoKV7XilisT/210pzhpN8b5FtZQ ZwuXALpKffMccjz+QodNSN+ookpOVF48/ai7nNw7kFBeGxsG99 UXlVOWAd5PANrAUROnSfmGvxuhocAlloyG5P6b7uQadzMTQgoM 6t+w+E8WiyEmtuGjlP1fOftXwdD0Go7fq76A2hIL+Jw2mB8Vr1 ftDsGuHmdecCDBVvh1Lk= X-UI-Out-Filterresults: notjunk:1; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141111_013650_767508_41D6806A X-CRM114-Status: GOOD ( 10.22 ) X-Spam-Score: -0.0 (/) Cc: 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: , 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 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") --- I have no idea if this is the correct fix, this is just a mechanical conversion, so please review carefully. diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c index 7b04befd5271..e2698d29f436 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;