p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: octeon-usb: simplify if statement 

Simplify if statement to avoid deep nesting.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2016-02-26 02:13:55 +02:00 committed by Greg Kroah-Hartman
parent 25adcca6ec
commit 284ea26aaa
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/staging/octeon-usb/octeon-hcd.c
View File

@ -2768,26 +2768,23 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel)
*/ */
if (cvmx_usb_pipe_needs_split(usb, pipe)) { if (cvmx_usb_pipe_needs_split(usb, pipe)) {
if (transaction->stage == if (transaction->stage ==
CVMX_USB_STAGE_NON_CONTROL) CVMX_USB_STAGE_NON_CONTROL) {
transaction->stage = transaction->stage =
CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE; CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE;
else { } else if (buffer_space_left &&
if (buffer_space_left && (bytes_in_last_packet ==
(bytes_in_last_packet == pipe->max_packet)) {
pipe->max_packet)) transaction->stage =
transaction->stage = CVMX_USB_STAGE_NON_CONTROL;
CVMX_USB_STAGE_NON_CONTROL; } else {
else { if (transaction->type ==
if (transaction->type == CVMX_USB_TRANSFER_INTERRUPT)
CVMX_USB_TRANSFER_INTERRUPT) pipe->next_tx_frame +=
pipe->next_tx_frame += pipe->interval;
pipe->interval; cvmx_usb_perform_complete(usb,
cvmx_usb_perform_complete( pipe,
usb, transaction,
pipe, CVMX_USB_COMPLETE_SUCCESS);
transaction,
CVMX_USB_COMPLETE_SUCCESS);
}
} }
} else { } else {
if ((pipe->device_speed == if ((pipe->device_speed ==