From patchwork Fri Nov 7 15:41:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 40428 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 909CD218C0 for ; Fri, 7 Nov 2014 15:41:14 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf3141326lam.0 for ; Fri, 07 Nov 2014 07:41:13 -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:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=L42XCfj0/ktNwPnz5AnyGWgcK+L+4+uZ4ziPcKkCK8o=; b=EiPxvjzBuIxD2uLp8VTZlbq5TDg8vUXAehG/3vl/N8JYML7OdHE47nlWQs+2bgbpz4 JtNWQtEYcRLGO9iBm6jXOYx1LoH1r8fFNXNP4vQx/Sj9YcoELyDKisF+Mgfwpt2dnBOr 6DIG2/1UGgeNqDPMkx6T9ZF58cwlnaHijt6viA5jenRbqYgRhFESbY6L56u1HjuYQ2K0 hvLZ+5Zr1q5Je5xOne64seQ4gt7pAszo9RyEeO0jE9mboRFRhtfxJMRpsM+irHrx7u8s uOOeNy+bAOSnecnfh1BXWdVsGnmLBINXgl9gn+7nzZfPzavq9wDTzuCp+ICkKm8JwtCR dv2A== X-Gm-Message-State: ALoCoQl/lURBIceJQUsrn/aljPc7hwHGZeLjQeon7G/moJ0VAThYZr85V4dNB/V2PaGOvjpUyQmN X-Received: by 10.180.19.226 with SMTP id i2mr794528wie.5.1415374873479; Fri, 07 Nov 2014 07:41:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.67 with SMTP id z3ls224787lag.74.gmail; Fri, 07 Nov 2014 07:41:13 -0800 (PST) X-Received: by 10.112.125.106 with SMTP id mp10mr12223131lbb.50.1415374873318; Fri, 07 Nov 2014 07:41:13 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id oc10si15408719lbb.99.2014.11.07.07.41.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 07:41:13 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id 10so2903760lbg.28 for ; Fri, 07 Nov 2014 07:41:13 -0800 (PST) X-Received: by 10.152.5.38 with SMTP id p6mr11901794lap.44.1415374873061; Fri, 07 Nov 2014 07:41:13 -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 ew9csp219779lbc; Fri, 7 Nov 2014 07:41:12 -0800 (PST) X-Received: by 10.70.130.143 with SMTP id oe15mr12728086pdb.81.1415374871408; Fri, 07 Nov 2014 07:41:11 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vu4si2430459pbc.100.2014.11.07.07.41.10 for ; Fri, 07 Nov 2014 07:41:11 -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 S1752057AbaKGPlI (ORCPT + 3 others); Fri, 7 Nov 2014 10:41:08 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:59467 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751399AbaKGPlH (ORCPT ); Fri, 7 Nov 2014 10:41:07 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id sA7Ff48K023627; Fri, 7 Nov 2014 09:41:04 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id sA7Ff47q020110; Fri, 7 Nov 2014 09:41:04 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Fri, 7 Nov 2014 09:41:04 -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 sA7Ff31l020567; Fri, 7 Nov 2014 09:41:03 -0600 From: Felipe Balbi To: Linux USB Mailing List CC: , Felipe Balbi , Kishon Vijay Abraham I , Antoine Tenart Subject: [PATCH v2] phy: twl4030: Fix build breakage Date: Fri, 7 Nov 2014 09:41:34 -0600 Message-ID: <1415374894-19353-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.1.0.GIT MIME-Version: 1.0 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.217.169 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: , 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 --- drivers/phy/phy-twl4030-usb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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;