public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH 15/36] musb_hdrc: Search and replace nPipe with pipe
Date: Thu, 16 Aug 2007 02:40:38 -0700	[thread overview]
Message-ID: <1187257294890-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <1187257291525-git-send-email-tony@atomide.com>

Search and replace nPipe with pipe

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/usb/musb/musb_host.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index e821831..093edc1 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -175,8 +175,8 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
 	void __iomem		*mbase =  musb->mregs;
 	struct urb		*urb = next_urb(qh);
 	struct musb_hw_ep	*hw_ep = qh->hw_ep;
-	unsigned		nPipe = urb->pipe;
-	u8			address = usb_pipedevice(nPipe);
+	unsigned		pipe = urb->pipe;
+	u8			address = usb_pipedevice(pipe);
 	int			epnum = hw_ep->epnum;
 
 	/* initialize software qh state */
@@ -478,7 +478,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,
 	struct musb_hw_ep	*hw_ep = musb->endpoints + epnum;
 	void __iomem		*epio = hw_ep->regs;
 	struct musb_qh		*qh = hw_ep->in_qh;
-	int			nPipe = urb->pipe;
+	int			pipe = urb->pipe;
 	void			*buffer = urb->transfer_buffer;
 
 	// musb_ep_select(mbase, epnum);
@@ -488,7 +488,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,
 			urb->transfer_buffer_length);
 
 	/* unload FIFO */
-	if (usb_pipeisoc(nPipe)) {
+	if (usb_pipeisoc(pipe)) {
 		int					status = 0;
 		struct usb_iso_packet_descriptor	*d;
 
@@ -1164,7 +1164,7 @@ done:
 /* Service a Tx-Available or dma completion irq for the endpoint */
 void musb_host_tx(struct musb *musb, u8 epnum)
 {
-	int			nPipe;
+	int			pipe;
 	u8			done = FALSE;
 	u16			tx_csr;
 	size_t			wLength = 0;
@@ -1188,7 +1188,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)
 		goto finish;
 	}
 
-	nPipe = urb->pipe;
+	pipe = urb->pipe;
 	dma = is_dma_capable() ? hw_ep->tx_channel : NULL;
 	DBG(4, "OUT/TX%d end, csr %04x%s\n", epnum, tx_csr,
 			dma ? ", dma" : "");
@@ -1258,14 +1258,14 @@ void musb_host_tx(struct musb *musb, u8 epnum)
 	}
 
 	/* REVISIT this looks wrong... */
-	if (!status || dma || usb_pipeisoc(nPipe)) {
+	if (!status || dma || usb_pipeisoc(pipe)) {
 		if (dma)
 			wLength = dma->actual_len;
 		else
 			wLength = qh->segsize;
 		qh->offset += wLength;
 
-		if (usb_pipeisoc(nPipe)) {
+		if (usb_pipeisoc(pipe)) {
 			struct usb_iso_packet_descriptor	*d;
 
 			d = urb->iso_frame_desc + qh->iso_idx;
@@ -1385,7 +1385,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 	struct musb_qh		*qh = hw_ep->in_qh;
 	size_t			xfer_len;
 	void __iomem		*mbase = musb->mregs;
-	int			nPipe;
+	int			pipe;
 	u16			rx_csr, wVal;
 	u8			bIsochError = FALSE;
 	u8			done = FALSE;
@@ -1412,7 +1412,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 		return;
 	}
 
-	nPipe = urb->pipe;
+	pipe = urb->pipe;
 
 	DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zd)\n",
 		epnum, rx_csr, urb->actual_length,
-- 
1.5.2.3

  reply	other threads:[~2007-08-16  9:40 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-16  9:40 [PATCH 0/36] musb_hdrc: Yet more musb clean-up Tony Lindgren
2007-08-16  9:40 ` [PATCH 1/36] musb_hdrc: Add Nokia copyright, make GPLv2 license generic Tony Lindgren
2007-08-16  9:40   ` [PATCH 2/36]_csr Tony Lindgren
2007-08-16  9:40     ` [PATCH 3/36] musb_hdrc: Search and replace wCsr with csr Tony Lindgren
2007-08-16  9:40       ` [PATCH 4/36]xe Tony Lindgren
2007-08-16  9:40         ` [PATCH 5/36] musb_hdrc: Search and replace bIntrUSB with int_usb Tony Lindgren
2007-08-16  9:40           ` [PATCH 6/36] musb_hdrc: Search and replace bIntr with int_hsdma Tony Lindgren
2007-08-16  9:40             ` [PATCH 7/36] musb_hdrc: Search and replace bTransmit with transmit Tony Lindgren
2007-08-16  9:40               ` [PATCH 8/36] musb_hdrc: Search and replace pUrb with urb Tony Lindgren
2007-08-16  9:40                 ` [PATCH 9/36] musb_hdrc: Search and replace pBuffer with buf Tony Lindgren
2007-08-16  9:40                   ` [PATCH 10/36] musb_hdrc: Search and replace dwLength with len Tony Lindgren
2007-08-16  9:40                     ` [PATCH 11/36] musb_hdrc: Search and replace wEndMask with epmask Tony Lindgren
2007-08-16  9:40                       ` [PATCH 12/36] musb_hdrc: Search and replace pDmaChannel with dma_channel Tony Lindgren
2007-08-16  9:40                         ` [PATCH 13/36] musb_hdrc: Search and replace wRxCount with rx_count Tony Lindgren
2007-08-16  9:40                           ` [PATCH 14/36] musb_hdrc: Search and replace bDone with done Tony Lindgren
2007-08-16  9:40                             ` Tony Lindgren [this message]
2007-08-16  9:40                               ` [PATCH 16/36] musb_hdrc: Search and replace wLoadCount with load_count Tony Lindgren
2007-08-16  9:40                                 ` [PATCH 17/36] musb_hdrc: Search and replace bDmaOk with dma_ok Tony Lindgren
2007-08-16  9:40                                   ` [PATCH 18/36] musb_hdrc: Search and replace pFifoDest with fifo_dest Tony Lindgren
2007-08-16  9:40                                     ` [PATCH 19/36] musb_hdrc: Search and replace pFifoSource with fifo_src Tony Lindgren
2007-08-16  9:40                                       ` [PATCH 20/36] musb_hdrc: Search and replace bIsochError with iso_err Tony Lindgren
2007-08-16  9:40                                         ` [PATCH 21/36] musb_hdrc: Search and replace wVal with val, except for wValue Tony Lindgren
2007-08-16  9:40                                           ` [PATCH 22/36] musb_hdrc: Search and replace wBestDiff with best_diff Tony Lindgren
2007-08-16  9:40                                             ` [PATCH 23/36] musb_hdrc: Search and replace nBestEnd with best_end Tony Lindgren
2007-08-16  9:40                                               ` [PATCH 24/36] musb_hdrc: Search and replace nEnd with epnum Tony Lindgren
2007-08-16  9:40                                                 ` [PATCH 25/36] musb_hdrc: Search and replace wFrame with frame Tony Lindgren
2007-08-16  9:40                                                   ` [PATCH 26/36] musb_hdrc: Search and replace wRelease with hwvers Tony Lindgren
2007-08-16  9:40                                                     ` [PATCH 27/36] musb_hdrc: Search and replace wRelMajor with rev_major Tony Lindgren
2007-08-16  9:40                                                       ` [PATCH 28/36] musb_hdrc: Search and replace wRelMinor with rev_minor Tony Lindgren
2007-08-16  9:40                                                         ` [PATCH 29/36] musb_hdrc: Search and replace dwData with data Tony Lindgren
2007-08-16  9:40                                                           ` [PATCH 30/36] musb_hdrc: Search and replace pController with controller Tony Lindgren
2007-08-16  9:40                                                             ` [PATCH 31/36] musb_hdrc: Search and replace wType with musb_type Tony Lindgren
2007-08-16  9:40                                                               ` [PATCH 32/36] musb_hdrc: Search and replace bReg with reg Tony Lindgren
2007-08-16  9:40                                                                 ` [PATCH 33/36] musb_hdrc: Search and replace bMore with more Tony Lindgren
2007-08-16  9:40                                                                   ` [PATCH 34/36] musb_hdrc: Search and replace bComplete with complete Tony Lindgren
2007-08-16  9:40                                                                     ` [PATCH 35/36] musb_hdrc: Get rid of unnecessary DMA typedef & fix a comment typo Tony Lindgren
2007-08-16  9:40                                                                       ` [PATCH 36/36] musb_hdrc: Search and replace MGC_DMA with MUSB_DMA Tony Lindgren
2007-08-16 18:03                 ` [PATCH 8/36] musb_hdrc: Search and replace pUrb with urb David Brownell
2007-08-17  7:18                   ` Tony Lindgren
2007-08-16 10:55 ` [PATCH 0/36] musb_hdrc: Yet more musb clean-up Felipe Balbi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1187257294890-git-send-email-tony@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-omap-open-source@linux.omap.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox