musb_hdrc: Search and replace bBulkCombine with bulk_combine

Search and replace bBulkCombine with bulk_combine

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index 08c696737d59ce6c09f75a6c18bdbd9cd8e6f9d5..d6304a0e633d9cabd557264d470b45e01880f6d9 100644 (file)
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -411,11 +411,11 @@ struct musb {
 #endif
 
 #ifdef C_MP_RX
-       unsigned bBulkCombine:1;
+       unsigned bulk_combine:1;
        /* REVISIT allegedly doesn't work reliably */
 #if 0
 #define        can_bulk_combine(musb,type) \
-               (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bBulkCombine)
+               (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine)
 #else
 #define        can_bulk_combine(musb,type)     0
 #endif

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 26f5d0f3403e6ac63f2a841738649900f1e4ab3f..f4089f0c11d7b48dbe963211975768cba9f8cdcb 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -1267,7 +1267,7 @@ static int __init musb_core_init(u16 wType, struct musb *musb)
        if (reg & MGC_M_CONFIGDATA_MPRXE) {
                strcat(aInfo, ", bulk combine");
 #ifdef C_MP_RX
-               musb->bBulkCombine = TRUE;
+               musb->bulk_combine = TRUE;
 #else
                strcat(aInfo, " (X)");          /* no driver support */
 #endif