From: Ajay Kumar Gupta <ajay.gupta@ti.com>
To: linux-usb@vger.kernel.org
Cc: linux-omap@vger.kernel.org, felipe.balbi@nokia.com,
gregkh@suse.de, Ajay Kumar Gupta <ajay.gupta@ti.com>
Subject: [PATCH 2/4] usb: musb: fix compilation warning in host only mode
Date: Thu, 8 Jul 2010 14:03:00 +0530 [thread overview]
Message-ID: <1278577982-30046-3-git-send-email-ajay.gupta@ti.com> (raw)
In-Reply-To: <1278577982-30046-2-git-send-email-ajay.gupta@ti.com>
Fixes below compilation warning when host only configuration is
selected.
drivers/usb/musb/musb_core.c: In function 'musb_stage0_irq':
drivers/usb/musb/musb_core.c:711: warning: unused variable 'mbase'
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
---
drivers/usb/musb/musb_core.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3b795c5..540c766 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -704,7 +704,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
#ifdef CONFIG_USB_MUSB_HDRC_HCD
if (int_usb & MUSB_INTR_CONNECT) {
struct usb_hcd *hcd = musb_to_hcd(musb);
- void __iomem *mbase = musb->mregs;
handled = IRQ_HANDLED;
musb->is_active = 1;
@@ -717,9 +716,9 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
if (is_peripheral_active(musb)) {
/* REVISIT HNP; just force disconnect */
}
- musb_writew(mbase, MUSB_INTRTXE, musb->epmask);
- musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe);
- musb_writeb(mbase, MUSB_INTRUSBE, 0xf7);
+ musb_writew(musb->mregs, MUSB_INTRTXE, musb->epmask);
+ musb_writew(musb->mregs, MUSB_INTRRXE, musb->epmask & 0xfffe);
+ musb_writeb(musb->mregs, MUSB_INTRUSBE, 0xf7);
#endif
musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED
|USB_PORT_STAT_HIGH_SPEED
--
1.6.2.4
next prev parent reply other threads:[~2010-07-08 8:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-08 8:32 [patch-2.6.35-rc4+ 0/4] musb and ehci_omap patches Ajay Kumar Gupta
[not found] ` <1278577982-30046-1-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-07-08 8:32 ` [PATCH 1/4] usb: musb: use correct register widths in register dumps Ajay Kumar Gupta
2010-07-08 8:33 ` Ajay Kumar Gupta [this message]
[not found] ` <1278577982-30046-3-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-07-08 8:33 ` [PATCH 3/4] usb: ulpi: fix compilation warning Ajay Kumar Gupta
[not found] ` <1278577982-30046-4-git-send-email-ajay.gupta-l0cyMroinI0@public.gmane.org>
2010-07-08 8:33 ` [PATCH 4/4] usb: ehci_omap: fix device detect issue with modules Ajay Kumar Gupta
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=1278577982-30046-3-git-send-email-ajay.gupta@ti.com \
--to=ajay.gupta@ti.com \
--cc=felipe.balbi@nokia.com \
--cc=gregkh@suse.de \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.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;
as well as URLs for NNTP newsgroup(s).