Commit 2daf5966 authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Felipe Balbi

usb: musb: drop dangling CONFIG_USB_MUSB_DEBUG

CONFIG_USB_MUSB_DEBUG option was removed in

5c8a86e1 usb: musb: drop unneeded musb_debug trickery

to cleanup the code from driver specific debug facilities.  This patch
drops the last references to the musb debug config option,
unconditionally enabling all debug code paths, thus letting that code
being dropped at compile time if not needed.
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent d25ab3ec
...@@ -435,7 +435,6 @@ cppi_rndis_update(struct cppi_channel *c, int is_rx, ...@@ -435,7 +435,6 @@ cppi_rndis_update(struct cppi_channel *c, int is_rx,
} }
} }
#ifdef CONFIG_USB_MUSB_DEBUG
static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd) static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
{ {
pr_debug("RXBD/%s %08x: " pr_debug("RXBD/%s %08x: "
...@@ -444,21 +443,16 @@ static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd) ...@@ -444,21 +443,16 @@ static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
bd->hw_next, bd->hw_bufp, bd->hw_off_len, bd->hw_next, bd->hw_bufp, bd->hw_off_len,
bd->hw_options); bd->hw_options);
} }
#endif
static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx) static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx)
{ {
#ifdef CONFIG_USB_MUSB_DEBUG
struct cppi_descriptor *bd; struct cppi_descriptor *bd;
if (!_dbg_level(level))
return;
cppi_dump_rx(level, rx, tag); cppi_dump_rx(level, rx, tag);
if (rx->last_processed) if (rx->last_processed)
cppi_dump_rxbd("last", rx->last_processed); cppi_dump_rxbd("last", rx->last_processed);
for (bd = rx->head; bd; bd = bd->next) for (bd = rx->head; bd; bd = bd->next)
cppi_dump_rxbd("active", bd); cppi_dump_rxbd("active", bd);
#endif
} }
...@@ -784,6 +778,7 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket) ...@@ -784,6 +778,7 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
void __iomem *tibase = musb->ctrl_base; void __iomem *tibase = musb->ctrl_base;
int is_rndis = 0; int is_rndis = 0;
struct cppi_rx_stateram __iomem *rx_ram = rx->state_ram; struct cppi_rx_stateram __iomem *rx_ram = rx->state_ram;
struct cppi_descriptor *d;
if (onepacket) { if (onepacket) {
/* almost every USB driver, host or peripheral side */ /* almost every USB driver, host or peripheral side */
...@@ -897,14 +892,8 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket) ...@@ -897,14 +892,8 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
bd->hw_options |= CPPI_SOP_SET; bd->hw_options |= CPPI_SOP_SET;
tail->hw_options |= CPPI_EOP_SET; tail->hw_options |= CPPI_EOP_SET;
#ifdef CONFIG_USB_MUSB_DEBUG for (d = rx->head; d; d = d->next)
if (_dbg_level(5)) { cppi_dump_rxbd("S", d);
struct cppi_descriptor *d;
for (d = rx->head; d; d = d->next)
cppi_dump_rxbd("S", d);
}
#endif
/* in case the preceding transfer left some state... */ /* in case the preceding transfer left some state... */
tail = rx->last_processed; tail = rx->last_processed;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment