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 07/17] net2280: Code cleanout remove ep_stdrsp function
Date: Fri, 28 Nov 2014 14:50:52 +0100 [thread overview]
Message-ID: <1417182662-7405-8-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1417182662-7405-1-git-send-email-ricardo.ribalda@gmail.com>
ep_stdrsp was only called by handle_stat0_irqs_superspeed and with
always the same flags.
Remove the function and replace the call by the code inside the
function, since it is very simple once the dead code is removed.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
drivers/usb/gadget/udc/net2280.c | 49 +++++++---------------------------------
1 file changed, 8 insertions(+), 41 deletions(-)
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index e8c36db..653a8a2 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -2668,46 +2668,6 @@ static void ep_stall(struct net2280_ep *ep, int stall)
}
}
-static void ep_stdrsp(struct net2280_ep *ep, int value, int wedged)
-{
- /* set/clear, then synch memory views with the device */
- if (value) {
- ep->stopped = 1;
- if (ep->num == 0)
- ep->dev->protocol_stall = 1;
- else {
- if (ep->dma)
- ep_stop_dma(ep);
- ep_stall(ep, true);
- }
-
- if (wedged)
- ep->wedged = 1;
- } else {
- ep->stopped = 0;
- ep->wedged = 0;
-
- ep_stall(ep, false);
-
- /* Flush the queue */
- if (!list_empty(&ep->queue)) {
- struct net2280_request *req =
- list_entry(ep->queue.next, struct net2280_request,
- queue);
- if (ep->dma)
- resume_dma(ep);
- else {
- if (ep->is_in)
- write_fifo(ep, &req->req);
- else {
- if (read_fifo(ep, req))
- done(ep, req, 0);
- }
- }
- }
- }
-}
-
static void handle_stat0_irqs_superspeed(struct net2280 *dev,
struct net2280_ep *ep, struct usb_ctrlrequest r)
{
@@ -2864,7 +2824,14 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
e = get_ep_by_addr(dev, w_index);
if (!e || (w_value != USB_ENDPOINT_HALT))
goto do_stall3;
- ep_stdrsp(e, true, false);
+ ep->stopped = 1;
+ if (ep->num == 0)
+ ep->dev->protocol_stall = 1;
+ else {
+ if (ep->dma)
+ ep_stop_dma(ep);
+ ep_stall(ep, true);
+ }
allow_status_338x(ep);
break;
--
2.1.3
next prev parent reply other threads:[~2014-11-28 13:51 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 ` Ricardo Ribalda Delgado [this message]
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 ` [PATCH 16/17] net2280: Move ASSERT_OUT_NAKING into out_flush Ricardo Ribalda Delgado
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-8-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®