From: Tony Lindgren Date: Mon, 13 Aug 2007 09:52:54 +0000 (-0700) Subject: musb_hdrc: Search and replace pSource with src X-Git-Tag: v2.6.23-omap1~228^2~45 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d4721fa408180415af2a9aa33bed7a1f840120c7;p=linux-2.6-omap-h63xx.git musb_hdrc: Search and replace pSource with src Search and replace pSource with src Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h index a56c7102a32..afb003a7405 100644 --- a/drivers/usb/musb/musbdefs.h +++ b/drivers/usb/musb/musbdefs.h @@ -500,7 +500,7 @@ extern void musb_start(struct musb *musb); extern void musb_stop(struct musb *musb); extern void musb_write_fifo(struct musb_hw_ep *ep, - u16 wCount, const u8 * pSource); + u16 wCount, const u8 * src); extern void musb_read_fifo(struct musb_hw_ep *ep, u16 wCount, u8 * pDest); diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c index 866169cc932..d7378e9d0df 100644 --- a/drivers/usb/musb/plat_uds.c +++ b/drivers/usb/musb/plat_uds.c @@ -169,40 +169,40 @@ static inline struct musb *dev_to_musb(struct device *dev) /* * Load an endpoint's FIFO */ -void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 wCount, const u8 *pSource) +void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 wCount, const u8 *src) { void __iomem *fifo = hw_ep->fifo; - prefetch((u8 *)pSource); + prefetch((u8 *)src); DBG(4, "%cX ep%d fifo %p count %d buf %p\n", - 'T', hw_ep->bLocalEnd, fifo, wCount, pSource); + 'T', hw_ep->bLocalEnd, fifo, wCount, src); /* we can't assume unaligned reads work */ - if (likely((0x01 & (unsigned long) pSource) == 0)) { + if (likely((0x01 & (unsigned long) src) == 0)) { u16 index = 0; /* best case is 32bit-aligned source address */ - if ((0x02 & (unsigned long) pSource) == 0) { + if ((0x02 & (unsigned long) src) == 0) { if (wCount >= 4) { - writesl(fifo, pSource + index, wCount >> 2); + writesl(fifo, src + index, wCount >> 2); index += wCount & ~0x03; } if (wCount & 0x02) { - musb_writew(fifo, 0, *(u16*)&pSource[index]); + musb_writew(fifo, 0, *(u16*)&src[index]); index += 2; } } else { if (wCount >= 2) { - writesw(fifo, pSource + index, wCount >> 1); + writesw(fifo, src + index, wCount >> 1); index += wCount & ~0x01; } } if (wCount & 0x01) - musb_writeb(fifo, 0, pSource[index]); + musb_writeb(fifo, 0, src[index]); } else { /* byte aligned */ - writesb(fifo, pSource, wCount); + writesb(fifo, src, wCount); } }