xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadget: f_midi: move some of f_midi_transmit to separate func

Browse Source 
Move some of the f_midi_transmit to a separate f_midi_do_transmit
function so the massive indention levels are not so jarring.  This
introduces no changes in behaviour.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
This commit is contained in:
Michal Nazarewicz
2016-01-18 17:54:14 +01:00
committed by Felipe Balbi
parent f297e86c7f
commit 9a71eb5634
1 changed files with 83 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/usb/gadget/function/f_midi.c
View File

@@ -531,34 +531,31 @@ static void f_midi_drop_out_substreams(struct f_midi *midi)
} }
} }
static void f_midi_transmit(struct f_midi *midi) static int f_midi_do_transmit(struct f_midi *midi, struct usb_ep *ep)
{ {
struct usb_ep *ep = midi->in_ep;
bool active;
/* We only care about USB requests if IN endpoint is enabled */
if (!ep || !ep->enabled)
goto drop_out;
do {
struct usb_request *req = NULL; struct usb_request *req = NULL;
unsigned int len, i; unsigned int len, i;
bool active = false;
int err;
active = false; /*
* We peek the request in order to reuse it if it fails to enqueue on
/* We peek the request in order to reuse it if it fails * its endpoint
* to enqueue on its endpoint */ */
len = kfifo_peek(&midi->in_req_fifo, &req); len = kfifo_peek(&midi->in_req_fifo, &req);
if (len != 1) { if (len != 1) {
ERROR(midi, "%s: Couldn't get usb request\n", __func__); ERROR(midi, "%s: Couldn't get usb request\n", __func__);
goto drop_out; return -1;
} }
/* If buffer overrun, then we ignore this transmission. /*
* IMPORTANT: This will cause the user-space rawmidi device to block until a) usb * If buffer overrun, then we ignore this transmission.
* requests have been completed or b) snd_rawmidi_write() times out. */ * IMPORTANT: This will cause the user-space rawmidi device to block
* until a) usb requests have been completed or b) snd_rawmidi_write()
* times out.
*/
if (req->length > 0) if (req->length > 0)
return; return 0;
for (i = midi->in_last_port; i < MAX_PORTS; i++) { for (i = midi->in_last_port; i < MAX_PORTS; i++) {
struct gmidi_in_port *port = midi->in_port[i]; struct gmidi_in_port *port = midi->in_port[i];
@@ -584,9 +581,11 @@ static void f_midi_transmit(struct f_midi *midi)
} }
active = !!port->active; active = !!port->active;
/* Check if last port is still active, which means that /*
* there is still data on that substream but this current * Check if last port is still active, which means that there is
* request run out of space. */ * still data on that substream but this current request run out
* of space.
*/
if (active) { if (active) {
midi->in_last_port = i; midi->in_last_port = i;
/* There is no need to re-iterate though midi ports. */ /* There is no need to re-iterate though midi ports. */
@@ -594,8 +593,8 @@ static void f_midi_transmit(struct f_midi *midi)
} }
} }
if (req->length > 0) { if (req->length <= 0)
int err; return active;
err = usb_ep_queue(ep, req, GFP_ATOMIC); err = usb_ep_queue(ep, req, GFP_ATOMIC);
if (err < 0) { if (err < 0) {
@@ -607,8 +606,24 @@ static void f_midi_transmit(struct f_midi *midi)
kfifo_skip(&midi->in_req_fifo); kfifo_skip(&midi->in_req_fifo);
kfifo_put(&midi->in_req_fifo, req); kfifo_put(&midi->in_req_fifo, req);
} }
return active;
} }
} while (active);
static void f_midi_transmit(struct f_midi *midi)
{
struct usb_ep *ep = midi->in_ep;
int ret;
/* We only care about USB requests if IN endpoint is enabled */
if (!ep || !ep->enabled)
goto drop_out;
do {
ret = f_midi_do_transmit(midi, ep);
if (ret < 0)
goto drop_out;
} while (ret);
return; return;