From: Daniel Mack <zonque@gmail.com>
To: balbi@ti.com
Cc: bigeasy@linutronix.de, linux-usb@vger.kernel.org,
linux-omap@vger.kernel.org, neumann@teufel.de,
Daniel Mack <zonque@gmail.com>
Subject: [PATCH 5/5] usb: musb: dsps: indentation and whitespace fixes
Date: Mon, 25 Nov 2013 20:39:53 +0100 [thread overview]
Message-ID: <1385408393-19707-6-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1385408393-19707-1-git-send-email-zonque@gmail.com>
Just a cosmetic thing, no functional change.
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
drivers/usb/musb/musb_dsps.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 361ddf8..b27c072 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -131,9 +131,9 @@ struct dsps_context {
struct dsps_glue {
struct device *dev;
struct platform_device *musb; /* child musb pdev */
- const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */
+ const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */
struct timer_list timer; /* otg_workaround timer */
- unsigned long last_timer; /* last timer data for each instance */
+ unsigned long last_timer; /* last timer data for each instance */
struct dsps_context context;
};
@@ -213,7 +213,7 @@ static void dsps_musb_disable(struct musb *musb)
dsps_writel(reg_base, wrp->coreintr_clear, wrp->usb_bitmap);
dsps_writel(reg_base, wrp->epintr_clear,
- wrp->txep_bitmap | wrp->rxep_bitmap);
+ wrp->txep_bitmap | wrp->rxep_bitmap);
dsps_writeb(musb->mregs, MUSB_DEVCTL, 0);
}
@@ -234,7 +234,7 @@ static void otg_timer(unsigned long _musb)
*/
devctl = dsps_readb(mregs, MUSB_DEVCTL);
dev_dbg(musb->controller, "Poll devctl %02x (%s)\n", devctl,
- usb_otg_state_string(musb->xceiv->state));
+ usb_otg_state_string(musb->xceiv->state));
spin_lock_irqsave(&musb->lock, flags);
switch (musb->xceiv->state) {
@@ -298,7 +298,7 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
dsps_writel(reg_base, wrp->coreintr_status, usbintr);
dev_dbg(musb->controller, "usbintr (%x) epintr(%x)\n",
- usbintr, epintr);
+ usbintr, epintr);
/*
* DRVVBUS IRQs are the only proxy we have (a very poor one!) for
* DSPS IP's missing ID change IRQ. We need an ID change IRQ to
@@ -348,10 +348,9 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
/* NOTE: this must complete power-on within 100 ms. */
dev_dbg(musb->controller, "VBUS %s (%s)%s, devctl %02x\n",
- drvvbus ? "on" : "off",
- usb_otg_state_string(musb->xceiv->state),
- err ? " ERROR" : "",
- devctl);
+ drvvbus ? "on" : "off",
+ usb_otg_state_string(musb->xceiv->state),
+ err ? " ERROR" : "", devctl);
ret = IRQ_HANDLED;
}
@@ -692,9 +691,9 @@ static SIMPLE_DEV_PM_OPS(dsps_pm_ops, dsps_suspend, dsps_resume);
static struct platform_driver dsps_usbss_driver = {
.probe = dsps_probe,
- .remove = dsps_remove,
- .driver = {
- .name = "musb-dsps",
+ .remove = dsps_remove,
+ .driver = {
+ .name = "musb-dsps",
.pm = &dsps_pm_ops,
.of_match_table = musb_dsps_of_match,
},
--
1.8.4.2
next prev parent reply other threads:[~2013-11-25 19:40 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-25 19:39 [PATCH 0/5] musb/dsps: suspend related patches for 3.14 (rebased) Daniel Mack
2013-11-25 19:39 ` [PATCH 1/5] usb: musb: conditionally save and restore the context on suspend Daniel Mack
2013-11-25 19:44 ` Felipe Balbi
2013-11-25 20:08 ` Daniel Mack
2013-11-25 20:13 ` Felipe Balbi
[not found] ` <20131125201339.GH18046-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-11-25 20:27 ` Daniel Mack
2013-11-26 10:50 ` Sergei Shtylyov
2013-11-26 10:58 ` Daniel Mack
2013-11-25 19:39 ` [PATCH 2/5] usb: musb: call musb_port_suspend from musb_bus_suspend Daniel Mack
[not found] ` <1385408393-19707-3-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 19:46 ` Felipe Balbi
[not found] ` <20131125194629.GA18046-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-11-25 19:58 ` Daniel Mack
2013-11-25 20:01 ` Felipe Balbi
2013-11-25 20:21 ` Daniel Mack
[not found] ` <5293B144.10006-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 20:41 ` Alan Stern
[not found] ` <Pine.LNX.4.44L0.1311251534260.1172-100000-IYeN2dnnYyZXsRXLowluHWD2FQJk+8+b@public.gmane.org>
2013-11-25 20:44 ` Daniel Mack
2013-11-25 20:45 ` Felipe Balbi
[not found] ` <20131125200121.GE18046-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-11-25 20:47 ` Daniel Mack
[not found] ` <5293B754.9050406-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 20:49 ` Felipe Balbi
2013-11-25 20:34 ` Alan Stern
[not found] ` <1385408393-19707-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 19:39 ` [PATCH 3/5] usb: musb: dsps: add {tx,rx}_mode to wrapper Daniel Mack
2013-11-25 19:39 ` [PATCH 4/5] usb: musb: dsps: add support for suspend and resume Daniel Mack
[not found] ` <1385408393-19707-5-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 19:48 ` Felipe Balbi
2013-11-25 20:04 ` Daniel Mack
[not found] ` <5293AD40.6060607-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 20:08 ` Felipe Balbi
2013-11-25 20:26 ` Daniel Mack
2013-11-25 20:46 ` Felipe Balbi
2013-11-25 20:54 ` Daniel Mack
2013-11-25 20:55 ` Felipe Balbi
2013-11-25 19:39 ` Daniel Mack [this message]
[not found] ` <1385408393-19707-6-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-25 19:49 ` [PATCH 5/5] usb: musb: dsps: indentation and whitespace fixes Felipe Balbi
2013-11-25 19:59 ` Daniel Mack
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=1385408393-19707-6-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=balbi@ti.com \
--cc=bigeasy@linutronix.de \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neumann@teufel.de \
/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;
as well as URLs for NNTP newsgroup(s).