Commit 96eea587 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Greg Kroah-Hartman
Browse files

usb: xhci: Remove in_interrupt() checks 



The usage of in_interrupt() in drivers is phased out for various reasons.

xhci_set_hc_event_deq() has an !in_interrupt() check which is pointless
because the function is only invoked from xhci_mem_init() which is clearly
task context as it does GFP_KERNEL allocations. Remove it.

xhci_urb_enqueue() prints a debug message if an URB is submitted after the
underlying hardware was suspended. But that warning is only issued when
in_interrupt() is true, which makes no sense. Simply return -ESHUTDOWN and
be done with it.

Signed-off-by: default avatarAhmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Mathias Nyman <mathias.nyman@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Link: https://lore.kernel.org/r/20201019101110.148631116@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ca9a252

drivers/usb/host/xhci-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -2109,7 +2109,7 @@ static void xhci_set_hc_event_deq(struct xhci_hcd *xhci) 


	deq = xhci_trb_virt_to_dma(xhci->event_ring->deq_seg,

			xhci->event_ring->dequeue);

	if (deq == 0 && !in_interrupt())

	if (!deq)

		xhci_warn(xhci, "WARN something wrong with SW event ring "

				"dequeue ptr.\n");

	/* Update HC event ring dequeue pointer */

drivers/usb/host/xhci.c

+2 −4
Original line number Diff line number Diff line
@@ -1476,11 +1476,9 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag 
	ep_index = xhci_get_endpoint_index(&urb->ep->desc);

	ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state;



	if (!HCD_HW_ACCESSIBLE(hcd)) {

		if (!in_interrupt())

			xhci_dbg(xhci, "urb submitted during PCI suspend\n");

	if (!HCD_HW_ACCESSIBLE(hcd))

		return -ESHUTDOWN;

	}



	if (xhci->devs[slot_id]->flags & VDEV_PORT_ERROR) {

		xhci_dbg(xhci, "Can't queue urb, port error, link inactive\n");

		return -ENODEV;