From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
Peter Chen <peter.chen@freescale.com>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 16/17] net2280: Move ASSERT_OUT_NAKING into out_flush
Date: Fri, 28 Nov 2014 14:51:01 +0100 [thread overview]
Message-ID: <1417182662-7405-17-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1417182662-7405-1-git-send-email-ricardo.ribalda@gmail.com>
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>
---
drivers/usb/gadget/udc/net2280.c | 10 ++++++++--
drivers/usb/gadget/udc/net2280.h | 17 -----------------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index a978e6e..b1c253e 100644
--- 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 b31deb0..a307dce 100644
--- 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;
--
2.1.3
next prev parent reply other threads:[~2014-11-28 13:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-28 13:50 [PATCH 00/17] net2280: Code cleanout, improve debug and remove broken param Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 01/17] net2280: Remove obsolete module param use_dma_chaining Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 02/17] net2280: remove full_speed module parameter Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 03/17] net2280: Remove module parameter use_msi Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 04/17] net2280: Remove use_dma module parameter Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 05/17] net2280: Remove dma_started field Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 06/17] net2280: Remove restart_dma inline function definition Ricardo Ribalda Delgado
2014-11-28 14:46 ` Sergei Shtylyov
2014-11-28 15:21 ` Ricardo Ribalda Delgado
2014-11-28 20:16 ` Sergei Shtylyov
2014-12-23 18:44 ` Felipe Balbi
2014-12-23 20:20 ` Ricardo Ribalda Delgado
2014-12-23 23:44 ` Felipe Balbi
2014-11-28 13:50 ` [PATCH 07/17] net2280: Code cleanout remove ep_stdrsp function Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 08/17] net2280: Remove field is_halt Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 09/17] net2280: Remove function ep_stall Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 10/17] net2280: Merge abort_dma for 228x and 338x Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 11/17] net2280: Clean function net2280_queue Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 12/17] net2280: Improve patching of defect 7374 Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 13/17] net2280: Remove function resume_dma Ricardo Ribalda Delgado
2014-11-28 13:50 ` [PATCH 14/17] net2280: Declare allow_status_338x as inline Ricardo Ribalda Delgado
2014-11-28 13:51 ` [PATCH 15/17] net2280: Simplify scan_dma_completions Ricardo Ribalda Delgado
2014-11-28 13:51 ` Ricardo Ribalda Delgado [this message]
2014-11-28 13:51 ` [PATCH 17/17] net2280: Re-enable dynamic debug messages Ricardo Ribalda Delgado
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417182662-7405-17-git-send-email-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®