1 files changed, 3 insertions, 14 deletions

diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index f522000e8f06..9db211ee15b5 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -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)
 {
         pr_debug("RXBD/%s %08x: "
@@ -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_options);
 }
-#endif
 
 static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx)
 {
-#ifdef CONFIG_USB_MUSB_DEBUG
         struct cppi_descriptor  *bd;
 
-        if (!_dbg_level(level))
-                return;
         cppi_dump_rx(level, rx, tag);
         if (rx->last_processed)
                 cppi_dump_rxbd("last", rx->last_processed);
         for (bd = rx->head; bd; bd = bd->next)
                 cppi_dump_rxbd("active", bd);
-#endif
 }
 
 
@@ -784,6 +778,7 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
         void __iomem            *tibase = musb->ctrl_base;
         int                     is_rndis = 0;
         struct cppi_rx_stateram __iomem *rx_ram = rx->state_ram;
+        struct cppi_descriptor  *d;
 
         if (onepacket) {
                 /* 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)
         bd->hw_options |= CPPI_SOP_SET;
         tail->hw_options |= CPPI_EOP_SET;
 
-#ifdef CONFIG_USB_MUSB_DEBUG
-        if (_dbg_level(5)) {
-                struct cppi_descriptor  *d;
-
-                for (d = rx->head; d; d = d->next)
-                        cppi_dump_rxbd("S", d);
-        }
-#endif
+        for (d = rx->head; d; d = d->next)
+                cppi_dump_rxbd("S", d);
 
         /* in case the preceding transfer left some state... */
         tail = rx->last_processed;