All of lore.kernel.org
 help / color / mirror / Atom feed
From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/14] usb: omap_udc: using common vbus_active
Date: Thu, 14 Mar 2013 13:50:36 +0800	[thread overview]
Message-ID: <1363240242-25775-9-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1363240242-25775-1-git-send-email-peter.chen@freescale.com>

Using common vbus_active to indicate vbus status

CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
 drivers/usb/gadget/omap_udc.c |    4 ++--
 drivers/usb/gadget/omap_udc.h |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 06be85c..2d0cf7f 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -1186,7 +1186,7 @@ omap_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
 
 static int can_pullup(struct omap_udc *udc)
 {
-	return udc->driver && udc->softconnect && udc->vbus_active;
+	return udc->driver && udc->softconnect && udc->gadget.vbus_active;
 }
 
 static void pullup_enable(struct omap_udc *udc)
@@ -1253,7 +1253,7 @@ static int omap_vbus_session(struct usb_gadget *gadget, int is_active)
 	udc = container_of(gadget, struct omap_udc, gadget);
 	spin_lock_irqsave(&udc->lock, flags);
 	VDBG("VBUS %s\n", is_active ? "on" : "off");
-	udc->vbus_active = (is_active != 0);
+	gadget->vbus_active = (is_active != 0);
 	if (cpu_is_omap15xx()) {
 		/* "software" detect, ignored if !VBUS_MODE_1510 */
 		l = omap_readl(FUNC_MUX_CTRL_0);
diff --git a/drivers/usb/gadget/omap_udc.h b/drivers/usb/gadget/omap_udc.h
index cfadeb5..62cdb9d 100644
--- a/drivers/usb/gadget/omap_udc.h
+++ b/drivers/usb/gadget/omap_udc.h
@@ -166,7 +166,6 @@ struct omap_udc {
 	struct usb_phy			*transceiver;
 	struct list_head		iso;
 	unsigned			softconnect:1;
-	unsigned			vbus_active:1;
 	unsigned			ep0_pending:1;
 	unsigned			ep0_in:1;
 	unsigned			ep0_set_config:1;
-- 
1.7.0.4

  parent reply	other threads:[~2013-03-14  5:50 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-14  5:50 [PATCH 00/14] Add vbus status to udc-core Peter Chen
2013-03-14  5:50 ` [PATCH 01/14] usb: udc-core: introduce vbus_active for struct usb_gadget Peter Chen
2013-03-14  5:50 ` [PATCH 02/14] usb: chipidea: using common vbus_active Peter Chen
2013-03-14  5:50 ` [PATCH 03/14] usb: at91_udc: " Peter Chen
2013-03-14  5:50 ` [PATCH 04/14] usb: fsl_udc_core: " Peter Chen
2013-03-14  5:50 ` [PATCH 05/14] usb: lpc32xx_udc: " Peter Chen
2013-03-14  5:50 ` [PATCH 06/14] usb: mv_u3d_core: " Peter Chen
2013-03-14  5:50 ` [PATCH 07/14] usb: mv_udc: " Peter Chen
2013-03-14  5:50 ` Peter Chen [this message]
2013-03-14  5:50 ` [PATCH 09/14] usb: pch_udc: " Peter Chen
2013-03-14  5:50 ` [PATCH 10/14] usb: pxa25x_udc: " Peter Chen
2013-03-14  5:50 ` [PATCH 11/14] usb: pxa27x_udc: " Peter Chen
2013-03-14  5:50 ` [PATCH 12/14] usb: s3c2410_udc: " Peter Chen
2013-03-14  5:50 ` [PATCH 13/14] usb: udc-core: small cleanup for udc->gadget Peter Chen
2013-03-14  5:50 ` [PATCH 14/14] usb: udc-core: add judgement logic for usb_gadget_connect Peter Chen
2013-03-14  9:00   ` Felipe Balbi
2013-03-14  9:24     ` Peter Chen
2013-03-14 10:19       ` Felipe Balbi
2013-03-15  6:06         ` Peter Chen
2013-03-15  7:51           ` Felipe Balbi
2013-03-15 10:04             ` Peter Chen
2013-03-15 10:37               ` Felipe Balbi
2013-03-15 12:26                 ` Peter Chen
2013-03-18  6:52                 ` Peter Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1363240242-25775-9-git-send-email-peter.chen@freescale.com \
    --to=peter.chen@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.