From 98c841e443edea109951bcb88d404d2e5f5581bf Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 13 Aug 2007 02:53:58 -0700 Subject: [PATCH] musb_hdrc: Search and replace pDest with dst Search and replace pDest with dst Signed-off-by: Tony Lindgren --- drivers/usb/musb/musbdefs.h | 2 +- drivers/usb/musb/plat_uds.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h index afb003a7405..b612f1f4afe 100644 --- a/drivers/usb/musb/musbdefs.h +++ b/drivers/usb/musb/musbdefs.h @@ -502,7 +502,7 @@ extern void musb_stop(struct musb *musb); extern void musb_write_fifo(struct musb_hw_ep *ep, u16 wCount, const u8 * src); extern void musb_read_fifo(struct musb_hw_ep *ep, - u16 wCount, u8 * pDest); + u16 wCount, u8 * dst); extern void musb_load_testpacket(struct musb *); diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c index d7378e9d0df..2218c62c4ff 100644 --- a/drivers/usb/musb/plat_uds.c +++ b/drivers/usb/musb/plat_uds.c @@ -209,38 +209,38 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 wCount, const u8 *src) /* * Unload an endpoint's FIFO */ -void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 wCount, u8 *pDest) +void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 wCount, u8 *dst) { void __iomem *fifo = hw_ep->fifo; DBG(4, "%cX ep%d fifo %p count %d buf %p\n", - 'R', hw_ep->bLocalEnd, fifo, wCount, pDest); + 'R', hw_ep->bLocalEnd, fifo, wCount, dst); /* we can't assume unaligned writes work */ - if (likely((0x01 & (unsigned long) pDest) == 0)) { + if (likely((0x01 & (unsigned long) dst) == 0)) { u16 index = 0; /* best case is 32bit-aligned destination address */ - if ((0x02 & (unsigned long) pDest) == 0) { + if ((0x02 & (unsigned long) dst) == 0) { if (wCount >= 4) { - readsl(fifo, pDest, wCount >> 2); + readsl(fifo, dst, wCount >> 2); index = wCount & ~0x03; } if (wCount & 0x02) { - *(u16*)&pDest[index] = musb_readw(fifo, 0); + *(u16*)&dst[index] = musb_readw(fifo, 0); index += 2; } } else { if (wCount >= 2) { - readsw(fifo, pDest, wCount >> 1); + readsw(fifo, dst, wCount >> 1); index = wCount & ~0x01; } } if (wCount & 0x01) - pDest[index] = musb_readb(fifo, 0); + dst[index] = musb_readb(fifo, 0); } else { /* byte aligned */ - readsb(fifo, pDest, wCount); + readsb(fifo, dst, wCount); } } -- 2.41.1