From: Tony Lindgren <tony@atomide.com>
Date: Thu, 16 Aug 2007 08:10:27 +0000 (-0700)
Subject: musb_hdrc: Search and replace bDmaOk with dma_ok
X-Git-Tag: v2.6.23-omap1~193
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=295041218ec87a3b0f3b3b19696122ef99d4ebd7;p=linux-2.6-omap-h63xx.git

musb_hdrc: Search and replace bDmaOk with dma_ok

Search and replace bDmaOk with dma_ok

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

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index c1a6de6978d..823c640e58f 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -629,7 +629,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 {
 	struct dma_controller	*dma_controller;
 	struct dma_channel	*dma_channel;
-	u8			bDmaOk;
+	u8			dma_ok;
 	void __iomem		*mbase = musb->mregs;
 	struct musb_hw_ep	*hw_ep = musb->endpoints + epnum;
 	void __iomem		*epio = hw_ep->regs;
@@ -791,12 +791,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 
 			musb_writew(epio, MUSB_TXCSR, csr);
 
-			bDmaOk = dma_controller->channel_program(
+			dma_ok = dma_controller->channel_program(
 					dma_channel, packet_sz,
 					dma_channel->desired_mode,
 					urb->transfer_dma,
 					qh->segsize);
-			if (bDmaOk) {
+			if (dma_ok) {
 				load_count = 0;
 			} else {
 				dma_controller->channel_release(dma_channel);
@@ -830,14 +830,14 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 			/* TX uses "rndis" mode automatically, but needs help
 			 * to identify the zero-length-final-packet case.
 			 */
-			bDmaOk = dma_controller->channel_program(
+			dma_ok = dma_controller->channel_program(
 					dma_channel, packet_sz,
 					(urb->transfer_flags
 							& URB_ZERO_PACKET)
 						== URB_ZERO_PACKET,
 					urb->transfer_dma,
 					qh->segsize);
-			if (bDmaOk) {
+			if (dma_ok) {
 				load_count = 0;
 			} else {
 				dma_controller->channel_release(dma_channel);
@@ -915,13 +915,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 				/* unless caller treats short rx transfers as
 				 * errors, we dare not queue multiple transfers.
 				 */
-				bDmaOk = dma_controller->channel_program(
+				dma_ok = dma_controller->channel_program(
 						dma_channel, packet_sz,
 						!(urb->transfer_flags
 							& URB_SHORT_NOT_OK),
 						urb->transfer_dma,
 						qh->segsize);
-				if (!bDmaOk) {
+				if (!dma_ok) {
 					dma_controller->channel_release(
 							dma_channel);
 					dma_channel = hw_ep->rx_channel = NULL;