usb: gadget: udc: net2280: Move ASSERT_OUT_NAKING into out_flush

ASSERT_OUT_NAKING was only called by out_flush and was hidden behind a
ifdef.

This patch moves the inline function into out_flush and remove the
ifdef. The user can decide to print the debug message or not via dynamic
printk

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index a978e6e69eeda2624c321addd3147a7c80fa3ae0..b1c253e6916ea7ce76e8a9c08575fb1ddd3b90f7 100644 (file)
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -575,9 +575,15 @@ static void out_flush(struct net2280_ep *ep)
        u32     __iomem *statp;
        u32     tmp;
 
-       ASSERT_OUT_NAKING(ep);
-
        statp = &ep->regs->ep_stat;
+
+       tmp = readl(statp);
+       if (tmp & BIT(NAK_OUT_PACKETS)) {
+               ep_dbg(ep->dev, "%s %s %08x !NAK\n",
+                       ep->ep.name, __func__, tmp);
+               writel(BIT(SET_NAK_OUT_PACKETS), &ep->regs->ep_rsp);
+       }
+
        writel(BIT(DATA_OUT_PING_TOKEN_INTERRUPT) |
                BIT(DATA_PACKET_RECEIVED_INTERRUPT),
                statp);

diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index b31deb03ca38a020ed6eb04395a2c53425ee8f0c..a307dce2e1849c03fcdb8839444d30cef32997c4 100644 (file)
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -356,23 +356,6 @@ static inline void start_out_naking(struct net2280_ep *ep)
        readl(&ep->regs->ep_rsp);
 }
 
-#ifdef DEBUG
-static inline void assert_out_naking(struct net2280_ep *ep, const char *where)
-{
-       u32     tmp = readl(&ep->regs->ep_stat);
-
-       if ((tmp & BIT(NAK_OUT_PACKETS)) == 0) {
-               ep_dbg(ep->dev, "%s %s %08x !NAK\n",
-                               ep->ep.name, where, tmp);
-               writel(BIT(SET_NAK_OUT_PACKETS),
-                       &ep->regs->ep_rsp);
-       }
-}
-#define ASSERT_OUT_NAKING(ep) assert_out_naking(ep, __func__)
-#else
-#define ASSERT_OUT_NAKING(ep) do {} while (0)
-#endif
-
 static inline void stop_out_naking(struct net2280_ep *ep)
 {
        u32     tmp;