| From ed9c0e52ee23f8a06e3eb752a6824d4abd31c685 Mon Sep 17 00:00:00 2001 |
| From: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Date: Mon, 23 Jan 2017 14:20:16 +0200 |
| Subject: [PATCH 203/255] xhci: use the trb_to_noop() helper for command trbs |
| |
| Remove duplicate code by using trb_to_noop() when |
| handling Aborted commads |
| |
| Based on earlier code by Felipe Balbi <felipe.balbi@linux.intel.com> |
| |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 5278204c98188ac9fd2e75b936eec1015d062a75) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-ring.c | 12 ++---------- |
| 1 file changed, 2 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -314,7 +314,6 @@ static void xhci_handle_stopped_cmd_ring |
| struct xhci_command *cur_cmd) |
| { |
| struct xhci_command *i_cmd; |
| - u32 cycle_state; |
| |
| /* Turn all aborted commands in list to no-ops, then restart */ |
| list_for_each_entry(i_cmd, &xhci->cmd_list, cmd_list) { |
| @@ -326,15 +325,8 @@ static void xhci_handle_stopped_cmd_ring |
| |
| xhci_dbg(xhci, "Turn aborted command %p to no-op\n", |
| i_cmd->command_trb); |
| - /* get cycle state from the original cmd trb */ |
| - cycle_state = le32_to_cpu( |
| - i_cmd->command_trb->generic.field[3]) & TRB_CYCLE; |
| - /* modify the command trb to no-op command */ |
| - i_cmd->command_trb->generic.field[0] = 0; |
| - i_cmd->command_trb->generic.field[1] = 0; |
| - i_cmd->command_trb->generic.field[2] = 0; |
| - i_cmd->command_trb->generic.field[3] = cpu_to_le32( |
| - TRB_TYPE(TRB_CMD_NOOP) | cycle_state); |
| + |
| + trb_to_noop(i_cmd->command_trb, TRB_CMD_NOOP); |
| |
| /* |
| * caller waiting for completion is called when command |
