From: Tony Lindgren <tony@atomide.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH 4/8] musb_hdrc: Search and replace MGC_END0_FIFOSIZE with MUSB_EP0_FIFOSIZE, remove MGC_MAX_USB_ENDS
Date: Wed, 15 Aug 2007 07:21:41 -0700 [thread overview]
Message-ID: <11871877193281-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <1187187715940-git-send-email-tony@atomide.com>
Search and replace MGC_END0_FIFOSIZE with MUSB_EP0_FIFOSIZE, remove MGC_MAX_USB_ENDS
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/usb/musb/g_ep0.c | 2 +-
drivers/usb/musb/musbdefs.h | 2 +-
drivers/usb/musb/musbhdrc.h | 4 +---
drivers/usb/musb/plat_uds.c | 4 ++--
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/musb/g_ep0.c b/drivers/usb/musb/g_ep0.c
index 1fa0cad..9585d00 100644
--- a/drivers/usb/musb/g_ep0.c
+++ b/drivers/usb/musb/g_ep0.c
@@ -497,7 +497,7 @@ static void ep0_txstate(struct musb *musb)
/* load the data */
pFifoSource = (u8 *) request->buf + request->actual;
- fifo_count = min((unsigned) MGC_END0_FIFOSIZE,
+ fifo_count = min((unsigned) MUSB_EP0_FIFOSIZE,
request->length - request->actual);
musb_write_fifo(&musb->endpoints[0], fifo_count, pFifoSource);
request->actual += fifo_count;
diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index 25dce14..5ce0505 100644
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -175,7 +175,7 @@ static inline void musb_host_rx(struct musb *m, u8 e) {}
#endif
#ifndef MUSB_MAX_END0_PACKET
-#define MUSB_MAX_END0_PACKET ((u16)MGC_END0_FIFOSIZE)
+#define MUSB_MAX_END0_PACKET ((u16)MUSB_EP0_FIFOSIZE)
#endif
/* host side ep0 states */
diff --git a/drivers/usb/musb/musbhdrc.h b/drivers/usb/musb/musbhdrc.h
index d26910f..225fac9 100644
--- a/drivers/usb/musb/musbhdrc.h
+++ b/drivers/usb/musb/musbhdrc.h
@@ -38,9 +38,7 @@
* HDRC-specific definitions
*/
-#define MGC_MAX_USB_ENDS 16
-
-#define MGC_END0_FIFOSIZE 64 /* this is non-configurable */
+#define MUSB_EP0_FIFOSIZE 64 /* this is non-configurable */
/*
* MUSBMHDRC Register map
diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 7b516ad..71e89d8 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -1335,8 +1335,8 @@ static int __init musb_core_init(u16 wType, struct musb *musb)
musb_driver_name, type, aRevision, aDate);
/* configure ep0 */
- musb->endpoints[0].max_packet_sz_tx = MGC_END0_FIFOSIZE;
- musb->endpoints[0].max_packet_sz_rx = MGC_END0_FIFOSIZE;
+ musb->endpoints[0].max_packet_sz_tx = MUSB_EP0_FIFOSIZE;
+ musb->endpoints[0].max_packet_sz_rx = MUSB_EP0_FIFOSIZE;
/* discover endpoint configuration */
musb->nr_endpoints = 1;
--
1.5.2.3
next prev parent reply other threads:[~2007-08-15 14:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-15 14:21 [PATCH 0/8] musb_hdrc: Series of patches to clean-up musbhdrc.h Tony Lindgren
2007-08-15 14:21 ` [PATCH 1/8] musb_hdrc: Search and replace MGC_O_HDRC_ with MUSB_ Tony Lindgren
2007-08-15 14:21 ` [PATCH 2/8] musb_hdrc: Search and replace MGC_M_ " Tony Lindgren
2007-08-15 14:21 ` [PATCH 3/8] musb_hdrc: Search and replace MGC_S_XXX with MUSB_XXX_SHIFT Tony Lindgren
2007-08-15 14:21 ` Tony Lindgren [this message]
2007-08-15 14:21 ` [PATCH 5/8] musb_hdrc: Search and replace _bOffset with _offset Tony Lindgren
2007-08-15 14:21 ` [PATCH 6/8] musb_hdrc: Search and replace MGC_XXX_OFFSET with MUSB_XXX_OFFSET Tony Lindgren
2007-08-15 14:21 ` [PATCH 7/8] musb_hdrc: Remove old unsed MGC_TYPE_SPEED_XXX Tony Lindgren
2007-08-15 14:21 ` [PATCH 8/8] musb_hdrc: Tabify and clean-up musbhdrc.h Tony Lindgren
2007-08-15 16:20 ` David Brownell
2007-08-16 6:46 ` [PATCH] musb_hdrc: Add Nokia Copyright, Make GPLv2 text generic (Was: [PATCH 8/8] musb_hdrc: Tabify and clean-up musbhdrc.h) Tony Lindgren
2007-08-16 7:50 ` David Brownell
2007-08-16 9:13 ` Tony Lindgren
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=11871877193281-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