From: Tony Lindgren Date: Wed, 15 Aug 2007 13:45:14 +0000 (-0700) Subject: musb_hdrc: Search and replace _bOffset with _offset X-Git-Tag: v2.6.23-omap1~213 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=025755d913247759d64cfe85b5254138090fe90f;p=linux-2.6-omap-h63xx.git musb_hdrc: Search and replace _bOffset with _offset Search and replace _bOffset with _offset Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/musb/musbhdrc.h b/drivers/usb/musb/musbhdrc.h index 225fac9f6d2..c862e6502f5 100644 --- a/drivers/usb/musb/musbhdrc.h +++ b/drivers/usb/musb/musbhdrc.h @@ -105,17 +105,17 @@ #define MUSB_CONFIGDATA MUSB_FIFOSIZE /* re-used for EP0 */ /* offsets to endpoint registers in indexed model (using INDEX register) */ -#define MGC_INDEXED_OFFSET(_epnum, _bOffset) \ - (0x10 + (_bOffset)) +#define MGC_INDEXED_OFFSET(_epnum, _offset) \ + (0x10 + (_offset)) /* offsets to endpoint registers in flat models */ -#define MGC_FLAT_OFFSET(_epnum, _bOffset) \ - (0x100 + (0x10*(_epnum)) + (_bOffset)) +#define MGC_FLAT_OFFSET(_epnum, _offset) \ + (0x100 + (0x10*(_epnum)) + (_offset)) #ifdef CONFIG_USB_TUSB6010 /* TUSB6010 EP0 configuration register is special */ -#define MGC_TUSB_OFFSET(_epnum, _bOffset) \ - (0x10 + _bOffset) +#define MGC_TUSB_OFFSET(_epnum, _offset) \ + (0x10 + _offset) #include "tusb6010.h" /* needed "only" for TUSB_EP0_CONF */ #endif @@ -128,8 +128,8 @@ #define MUSB_RXHUBADDR 0x06 #define MUSB_RXHUBPORT 0x07 -#define MGC_BUSCTL_OFFSET(_epnum, _bOffset) \ - (0x80 + (8*(_epnum)) + (_bOffset)) +#define MGC_BUSCTL_OFFSET(_epnum, _offset) \ + (0x80 + (8*(_epnum)) + (_offset)) /* * MUSBHDRC Register bit masks diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 5292e2dce4f..5b6a42f91e4 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -50,8 +50,8 @@ #define MGC_O_HSDMA_ADDRESS 0x8 #define MGC_O_HSDMA_COUNT 0xc -#define MGC_HSDMA_CHANNEL_OFFSET(_bChannel, _bOffset) \ - (MGC_O_HSDMA_BASE + (_bChannel << 4) + _bOffset) +#define MGC_HSDMA_CHANNEL_OFFSET(_bChannel, _offset) \ + (MGC_O_HSDMA_BASE + (_bChannel << 4) + _offset) /* control register (16-bit): */ #define MUSB_HSDMA_ENABLE_SHIFT 0