Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d82f3db2 authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Felipe Balbi
Browse files

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: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 43780aaa

drivers/usb/gadget/udc/net2280.c

+8 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/gadget/udc/net2280.h

+0 −17
Original line number Diff line number Diff line
@@ -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;