| Message ID | 20201014145727.607191004@linutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | UBS: Cleanup in_interupt/in_irq/in_atomic() usage | expand |
On 14.10.2020 17.52, Thomas Gleixner wrote: > From: Ahmed S. Darwish <a.darwish@linutronix.de> > > 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: Ahmed S. Darwish <a.darwish@linutronix.de> > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: Mathias Nyman <mathias.nyman@intel.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-usb@vger.kernel.org > --- > drivers/usb/host/xhci-mem.c | 2 +- > drivers/usb/host/xhci.c | 6 ++---- > 2 files changed, 3 insertions(+), 5 deletions(-) Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
--- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -2110,7 +2110,7 @@ static void xhci_set_hc_event_deq(struct 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 */ --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1473,11 +1473,9 @@ static int xhci_urb_enqueue(struct usb_h 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;