1 From 901b05b33b8ca924bab3fa63ef3fd6dcb123e318 Mon Sep 17 00:00:00 2001
2 From: Hugo Villeneuve <hugo@hugovil.com>
3 Date: Sat, 24 Jan 2009 17:57:30 -0800
4 Subject: [PATCH 01/12] USB: musb cppi bugfixes
6 These compilation errors are related to incorrect
7 debugging macro and variable names and generated the
10 drivers/usb/musb/cppi_dma.c:437:5: warning: "MUSB_DEBUG" is not defined
11 drivers/usb/musb/cppi_dma.c: In function 'cppi_next_rx_segment':
12 drivers/usb/musb/cppi_dma.c:884: error: 'debug' undeclared (first use in this function)
14 Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
15 Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 drivers/usb/musb/cppi_dma.c | 9 +++++++--
19 1 files changed, 7 insertions(+), 2 deletions(-)
21 diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
22 index 5ad6d08..d8d5345 100644
23 --- a/drivers/usb/musb/cppi_dma.c
24 +++ b/drivers/usb/musb/cppi_dma.c
26 #include <linux/usb.h>
28 #include "musb_core.h"
29 +#include "musb_debug.h"
33 @@ -423,6 +424,7 @@ cppi_rndis_update(struct cppi_channel *c, int is_rx,
37 +#ifdef CONFIG_USB_MUSB_DEBUG
38 static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
40 pr_debug("RXBD/%s %08x: "
41 @@ -431,10 +433,11 @@ static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
42 bd->hw_next, bd->hw_bufp, bd->hw_off_len,
47 static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx)
50 +#ifdef CONFIG_USB_MUSB_DEBUG
51 struct cppi_descriptor *bd;
53 if (!_dbg_level(level))
54 @@ -881,12 +884,14 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
55 bd->hw_options |= CPPI_SOP_SET;
56 tail->hw_options |= CPPI_EOP_SET;
59 +#ifdef CONFIG_USB_MUSB_DEBUG
60 + if (_dbg_level(5)) {
61 struct cppi_descriptor *d;
63 for (d = rx->head; d; d = d->next)
64 cppi_dump_rxbd("S", d);
68 /* in case the preceding transfer left some state... */
69 tail = rx->last_processed;