From: Felipe Contreras <felipe.contreras@gmail.com>
To: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
Felipe Balbi <balbi@ti.com>, Greg Kroah-Hartman <gregkh@suse.de>,
Jiri Kosina <trivial@kernel.org>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 3/3] usb: musb: remove a bit of indentation
Date: Fri, 16 Dec 2011 01:05:10 +0200 [thread overview]
Message-ID: <1323990310-11905-4-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1323990310-11905-1-git-send-email-felipe.contreras@gmail.com>
And use dev instead of musb->controller.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
drivers/usb/musb/omap2430.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index a615538..31fc8a2 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -344,20 +344,19 @@ static void omap2430_musb_enable(struct musb *musb)
case USB_EVENT_ID:
otg_init(musb->xceiv);
- if (data->interface_type == MUSB_INTERFACE_UTMI) {
- devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
- /* start the session */
- devctl |= MUSB_DEVCTL_SESSION;
- musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
- while (musb_readb(musb->mregs, MUSB_DEVCTL) &
- MUSB_DEVCTL_BDEVICE) {
- cpu_relax();
-
- if (time_after(jiffies, timeout)) {
- dev_err(musb->controller,
- "configured as A device timeout");
- break;
- }
+ if (data->interface_type != MUSB_INTERFACE_UTMI)
+ break;
+ devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
+ /* start the session */
+ devctl |= MUSB_DEVCTL_SESSION;
+ musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
+ while (musb_readb(musb->mregs, MUSB_DEVCTL) &
+ MUSB_DEVCTL_BDEVICE) {
+ cpu_relax();
+
+ if (time_after(jiffies, timeout)) {
+ dev_err(dev, "configured as A device timeout");
+ break;
}
}
break;
--
1.7.8.rc1.14.g248db
prev parent reply other threads:[~2011-12-15 23:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 23:05 [PATCH 0/3] musb fixes and cleanups Felipe Contreras
2011-12-15 23:05 ` [PATCH 1/3] usb: musb: fix pm_runtime mismatches Felipe Contreras
2011-12-15 23:22 ` Alan Stern
2011-12-16 0:59 ` Felipe Contreras
2011-12-16 3:30 ` Alan Stern
2011-12-19 20:21 ` Felipe Contreras
2011-12-19 8:11 ` Felipe Balbi
2011-12-19 20:20 ` Felipe Contreras
2011-12-20 11:19 ` Felipe Balbi
2011-12-20 19:43 ` Felipe Contreras
2011-12-15 23:05 ` [PATCH 2/3] usb: musb: trivial cleanup Felipe Contreras
2011-12-15 23:05 ` Felipe Contreras [this message]
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=1323990310-11905-4-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=balbi@ti.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=trivial@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®