From patchwork Thu Mar 14 05:50:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 2267621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 4B2483FC8A for ; Thu, 14 Mar 2013 05:55:59 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UG16L-0001q2-Gs; Thu, 14 Mar 2013 05:53:17 +0000 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UG14b-0000vn-0T for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2013 05:51:31 +0000 Received: from mail228-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE013.bigfish.com (10.7.40.63) with Microsoft SMTP Server id 14.1.225.23; Thu, 14 Mar 2013 05:51:27 +0000 Received: from mail228-va3 (localhost [127.0.0.1]) by mail228-va3-R.bigfish.com (Postfix) with ESMTP id 42ADDCC007E; Thu, 14 Mar 2013 05:51:27 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail228-va3 (localhost.localdomain [127.0.0.1]) by mail228-va3 (MessageSwitch) id 1363240285801010_13573; Thu, 14 Mar 2013 05:51:25 +0000 (UTC) Received: from VA3EHSMHS020.bigfish.com (unknown [10.7.14.244]) by mail228-va3.bigfish.com (Postfix) with ESMTP id B5C7554004D; Thu, 14 Mar 2013 05:51:25 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS020.bigfish.com (10.7.99.30) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 14 Mar 2013 05:51:21 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.328.11; Thu, 14 Mar 2013 05:51:20 +0000 Received: from localhost.localdomain (nchen-desktop.ap.freescale.net [10.192.242.40]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r2E5ohlq001281; Wed, 13 Mar 2013 22:51:16 -0700 From: Peter Chen To: Subject: [PATCH 07/14] usb: mv_udc: using common vbus_active Date: Thu, 14 Mar 2013 13:50:35 +0800 Message-ID: <1363240242-25775-8-git-send-email-peter.chen@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1363240242-25775-1-git-send-email-peter.chen@freescale.com> References: <1363240242-25775-1-git-send-email-peter.chen@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130314_015129_191830_82615559 X-CRM114-Status: GOOD ( 11.40 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.180.13 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: stigge@antcom.de, kgene.kim@samsung.com, eric.y.miao@gmail.com, alexander.shishkin@linux.intel.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, haojian.zhuang@gmail.com, chao.xie@marvell.com, ben-linux@fluff.org, yuxu@marvell.com, leoli@freescale.com, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 Using common vbus_active to indicate vbus status CC: Chao Xie Signed-off-by: Peter Chen --- drivers/usb/gadget/mv_udc.h | 1 - drivers/usb/gadget/mv_udc_core.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/mv_udc.h b/drivers/usb/gadget/mv_udc.h index 9073436..6d848b4 100644 --- a/drivers/usb/gadget/mv_udc.h +++ b/drivers/usb/gadget/mv_udc.h @@ -206,7 +206,6 @@ struct mv_udc { int errors; unsigned softconnect:1, - vbus_active:1, remote_wakeup:1, softconnected:1, force_fs:1, diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index c8cf959..91a1b0d 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@ -1204,12 +1204,12 @@ static int mv_udc_vbus_session(struct usb_gadget *gadget, int is_active) udc = container_of(gadget, struct mv_udc, gadget); spin_lock_irqsave(&udc->lock, flags); - udc->vbus_active = (is_active != 0); + gadget->vbus_active = (is_active != 0); dev_dbg(&udc->dev->dev, "%s: softconnect %d, vbus_active %d\n", - __func__, udc->softconnect, udc->vbus_active); + __func__, udc->softconnect, gadget->vbus_active); - if (udc->driver && udc->softconnect && udc->vbus_active) { + if (udc->driver && udc->softconnect && gadget->vbus_active) { retval = mv_udc_enable(udc); if (retval == 0) { /* Clock is disabled, need re-init registers */ @@ -1244,9 +1244,9 @@ static int mv_udc_pullup(struct usb_gadget *gadget, int is_on) udc->softconnect = (is_on != 0); dev_dbg(&udc->dev->dev, "%s: softconnect %d, vbus_active %d\n", - __func__, udc->softconnect, udc->vbus_active); + __func__, udc->softconnect, gadget->vbus_active); - if (udc->driver && udc->softconnect && udc->vbus_active) { + if (udc->driver && udc->softconnect && gadget->vbus_active) { retval = mv_udc_enable(udc); if (retval == 0) { /* Clock is disabled, need re-init registers */ @@ -1254,7 +1254,7 @@ static int mv_udc_pullup(struct usb_gadget *gadget, int is_on) ep0_reset(udc); udc_start(udc); } - } else if (udc->driver && udc->vbus_active) { + } else if (udc->driver && gadget->vbus_active) { /* stop all the transfer in queue*/ stop_activity(udc, udc->driver); udc_stop(udc); @@ -2356,7 +2356,7 @@ static int mv_udc_probe(struct platform_device *pdev) if (udc->clock_gating) mv_udc_disable_internal(udc); else - udc->vbus_active = 1; + udc->gadget.vbus_active = 1; retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget); if (retval)