[PATCH 30/52] musb_hdrc: Search and replace bBulkCombine with bulk_combine

Tony Lindgren
2007-08-13T13:49:05Z

Search and replace bBulkCombine with bulk_combine

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/usb/musb/musbdefs.h | 4 ++--
drivers/usb/musb/plat_uds.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

--- 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
--- 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
--
1.5.2.3