| From 3d71eb22895dbf5e5081b1b96976803e3c6eb090 Mon Sep 17 00:00:00 2001 |
| From: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Date: Mon, 23 Jan 2017 14:20:07 +0200 |
| Subject: [PATCH 195/255] usb: host: xhci: simplify irq handler return |
| |
| Instead of having several return points, let's use a local variable and |
| a single place to return. This makes the code slightly easier to read. |
| |
| [set ret = IRQ_HANDLED in default working case -Mathias] |
| Signed-off-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 76a35293b901915c5dcb4a87a4a0da8d7caf39fe) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-ring.c | 32 +++++++++++++++++--------------- |
| 1 file changed, 17 insertions(+), 15 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -2608,27 +2608,28 @@ static int xhci_handle_event(struct xhci |
| irqreturn_t xhci_irq(struct usb_hcd *hcd) |
| { |
| struct xhci_hcd *xhci = hcd_to_xhci(hcd); |
| - u32 status; |
| - u64 temp_64; |
| union xhci_trb *event_ring_deq; |
| + irqreturn_t ret = IRQ_NONE; |
| dma_addr_t deq; |
| + u64 temp_64; |
| + u32 status; |
| |
| spin_lock(&xhci->lock); |
| /* Check if the xHC generated the interrupt, or the irq is shared */ |
| status = readl(&xhci->op_regs->status); |
| - if (status == 0xffffffff) |
| - goto hw_died; |
| - |
| - if (!(status & STS_EINT)) { |
| - spin_unlock(&xhci->lock); |
| - return IRQ_NONE; |
| + if (status == 0xffffffff) { |
| + ret = IRQ_HANDLED; |
| + goto out; |
| } |
| + |
| + if (!(status & STS_EINT)) |
| + goto out; |
| + |
| if (status & STS_FATAL) { |
| xhci_warn(xhci, "WARNING: Host System Error\n"); |
| xhci_halt(xhci); |
| -hw_died: |
| - spin_unlock(&xhci->lock); |
| - return IRQ_HANDLED; |
| + ret = IRQ_HANDLED; |
| + goto out; |
| } |
| |
| /* |
| @@ -2659,9 +2660,8 @@ hw_died: |
| temp_64 = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue); |
| xhci_write_64(xhci, temp_64 | ERST_EHB, |
| &xhci->ir_set->erst_dequeue); |
| - spin_unlock(&xhci->lock); |
| - |
| - return IRQ_HANDLED; |
| + ret = IRQ_HANDLED; |
| + goto out; |
| } |
| |
| event_ring_deq = xhci->event_ring->dequeue; |
| @@ -2686,10 +2686,12 @@ hw_died: |
| /* Clear the event handler busy flag (RW1C); event ring is empty. */ |
| temp_64 |= ERST_EHB; |
| xhci_write_64(xhci, temp_64, &xhci->ir_set->erst_dequeue); |
| + ret = IRQ_HANDLED; |
| |
| +out: |
| spin_unlock(&xhci->lock); |
| |
| - return IRQ_HANDLED; |
| + return ret; |
| } |
| |
| irqreturn_t xhci_msi_irq(int irq, void *hcd) |