From patchwork Thu Mar 14 05:50:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 2267641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 35497DFB79 for ; Thu, 14 Mar 2013 05:57:09 +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 1UG17F-0002G3-5x; Thu, 14 Mar 2013 05:54:14 +0000 Received: from am1ehsobe005.messaging.microsoft.com ([213.199.154.208] helo=am1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UG14b-0000vm-9n for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2013 05:51:32 +0000 Received: from mail72-am1-R.bigfish.com (10.3.201.236) by AM1EHSOBE025.bigfish.com (10.3.207.147) with Microsoft SMTP Server id 14.1.225.23; Thu, 14 Mar 2013 05:51:20 +0000 Received: from mail72-am1 (localhost [127.0.0.1]) by mail72-am1-R.bigfish.com (Postfix) with ESMTP id 49E4F42013D; Thu, 14 Mar 2013 05:51:20 +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 mail72-am1 (localhost.localdomain [127.0.0.1]) by mail72-am1 (MessageSwitch) id 1363240278394037_17978; Thu, 14 Mar 2013 05:51:18 +0000 (UTC) Received: from AM1EHSMHS006.bigfish.com (unknown [10.3.201.227]) by mail72-am1.bigfish.com (Postfix) with ESMTP id 52ACA4E0078; Thu, 14 Mar 2013 05:51:18 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS006.bigfish.com (10.3.207.106) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 14 Mar 2013 05:51:18 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.328.11; Thu, 14 Mar 2013 05:51:16 +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 r2E5ohlp001281; Wed, 13 Mar 2013 22:51:12 -0700 From: Peter Chen To: Subject: [PATCH 06/14] usb: mv_u3d_core: using common vbus_active Date: Thu, 14 Mar 2013 13:50:34 +0800 Message-ID: <1363240242-25775-7-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_651139_47E45E4A X-CRM114-Status: GOOD ( 12.55 ) 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 [213.199.154.208 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: Yu Xu Signed-off-by: Peter Chen --- drivers/usb/gadget/mv_u3d.h | 1 - drivers/usb/gadget/mv_u3d_core.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/mv_u3d.h b/drivers/usb/gadget/mv_u3d.h index e32a787..16a6955 100644 --- a/drivers/usb/gadget/mv_u3d.h +++ b/drivers/usb/gadget/mv_u3d.h @@ -274,7 +274,6 @@ struct mv_u3d { unsigned int errors; unsigned softconnect:1; - unsigned vbus_active:1; /* vbus is active or not */ unsigned remote_wakeup:1; /* support remote wakeup */ unsigned clock_gating:1; /* clock gating or not */ unsigned active:1; /* udc is active or not */ diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/mv_u3d_core.c index b5cea27..95236db 100644 --- a/drivers/usb/gadget/mv_u3d_core.c +++ b/drivers/usb/gadget/mv_u3d_core.c @@ -1159,15 +1159,15 @@ static int mv_u3d_vbus_session(struct usb_gadget *gadget, int is_active) spin_lock_irqsave(&u3d->lock, flags); - u3d->vbus_active = (is_active != 0); + u3d->gadget.vbus_active = (is_active != 0); dev_dbg(u3d->dev, "%s: softconnect %d, vbus_active %d\n", - __func__, u3d->softconnect, u3d->vbus_active); + __func__, u3d->softconnect, u3d->gadget.vbus_active); /* * 1. external VBUS detect: we can disable/enable clock on demand. * 2. UDC VBUS detect: we have to enable clock all the time. * 3. No VBUS detect: we have to enable clock all the time. */ - if (u3d->driver && u3d->softconnect && u3d->vbus_active) { + if (u3d->driver && u3d->softconnect && u3d->gadget.vbus_active) { retval = mv_u3d_enable(u3d); if (retval == 0) { /* @@ -1218,9 +1218,9 @@ static int mv_u3d_pullup(struct usb_gadget *gadget, int is_on) spin_lock_irqsave(&u3d->lock, flags); dev_dbg(u3d->dev, "%s: softconnect %d, vbus_active %d\n", - __func__, u3d->softconnect, u3d->vbus_active); + __func__, u3d->softconnect, u3d->gadget.vbus_active); u3d->softconnect = (is_on != 0); - if (u3d->driver && u3d->softconnect && u3d->vbus_active) { + if (u3d->driver && u3d->softconnect && u3d->gadget.vbus_active) { retval = mv_u3d_enable(u3d); if (retval == 0) { /* @@ -1231,7 +1231,7 @@ static int mv_u3d_pullup(struct usb_gadget *gadget, int is_on) mv_u3d_ep0_reset(u3d); mv_u3d_controller_start(u3d); } - } else if (u3d->driver && u3d->vbus_active) { + } else if (u3d->driver && u3d->gadget.vbus_active) { /* stop all the transfer in queue*/ mv_u3d_stop_activity(u3d, u3d->driver); mv_u3d_controller_stop(u3d); @@ -1976,7 +1976,7 @@ static int mv_u3d_probe(struct platform_device *dev) } if (!u3d->clock_gating) - u3d->vbus_active = 1; + u3d->gadget.vbus_active = 1; /* enable usb3 controller vbus detection */ u3d->vbus_valid_detect = 1;