Title: [9206] trunk/drivers/usb/musb/musb_core.c: musb: use upstream commit for unused warnings
- Revision
- 9206
- Author
- vapier
- Date
- 2010-10-15 21:45:28 -0400 (Fri, 15 Oct 2010)
Log Message
musb: use upstream commit for unused warnings
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_core.c (9205 => 9206)
--- trunk/drivers/usb/musb/musb_core.c 2010-10-15 23:11:31 UTC (rev 9205)
+++ trunk/drivers/usb/musb/musb_core.c 2010-10-16 01:45:28 UTC (rev 9206)
@@ -624,7 +624,6 @@
#ifdef CONFIG_USB_MUSB_HDRC_HCD
if (int_usb & MUSB_INTR_CONNECT) {
struct usb_hcd *hcd = musb_to_hcd(musb);
- void __iomem __maybe_unused *mbase = musb->mregs;
handled = IRQ_HANDLED;
musb->is_active = 1;
@@ -637,9 +636,9 @@
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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
