Hi,
On Tue, Dec 01, 2009 at 10:59:32AM +0100, Balbi Felipe (Nokia-D/Helsinki) wrote:
just makes the musb init code a bit cleaner.
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
drivers/usb/musb/musb_core.c | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index ed01070..a470fd2 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1314,9 +1314,6 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, };
*/
static int __init musb_core_init(u16 musb_type, struct musb *musb)
{
-#ifdef MUSB_AHB_ID
- u32 data;
-#endif
u8 reg;
char *type;
u16 hwvers, rev_major, rev_minor;
@@ -1331,22 +1328,10 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8");
if (reg & MUSB_CONFIGDATA_DYNFIFO)
strcat(aInfo, ", dyn FIFOs");
- if (reg & MUSB_CONFIGDATA_MPRXE) {
+ if (reg & MUSB_CONFIGDATA_MPRXE)
strcat(aInfo, ", bulk combine");
-#ifdef C_MP_RX
- musb->bulk_combine = true;
-#else
- strcat(aInfo, " (X)"); /* no driver support */
-#endif
I will tweak this one a little bit and keep the bulk_combine part.
- }
- if (reg & MUSB_CONFIGDATA_MPTXE) {
+ if (reg & MUSB_CONFIGDATA_MPTXE)
strcat(aInfo, ", bulk split");
-#ifdef C_MP_TX
- musb->bulk_split = true;
-#else
- strcat(aInfo, " (X)"); /* no driver support */
-#endif
likewise here.
will send new patches soon.
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
