| From ecc072c0aa5f3cc28ab1f8b14c57a8b138394bfa Mon Sep 17 00:00:00 2001 |
| From: Lu Baolu <baolu.lu@linux.intel.com> |
| Date: Fri, 7 Apr 2017 17:57:05 +0300 |
| Subject: [PATCH 191/286] usb: xhci: remove error messages for failed memory |
| allocation |
| |
| Omit extra messages for memory allocation failure. |
| |
| Signed-off-by: Lu Baolu <baolu.lu@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 74e0b5649c26428a4b87f496cef0df8307eff364) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-hub.c | 4 +--- |
| drivers/usb/host/xhci-mem.c | 1 - |
| drivers/usb/host/xhci-ring.c | 10 ++++------ |
| drivers/usb/host/xhci.c | 13 +++++++------ |
| 4 files changed, 12 insertions(+), 16 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-hub.c |
| +++ b/drivers/usb/host/xhci-hub.c |
| @@ -401,10 +401,8 @@ static int xhci_stop_device(struct xhci_ |
| trace_xhci_stop_device(virt_dev); |
| |
| cmd = xhci_alloc_command(xhci, false, true, GFP_NOIO); |
| - if (!cmd) { |
| - xhci_dbg(xhci, "Couldn't allocate command structure.\n"); |
| + if (!cmd) |
| return -ENOMEM; |
| - } |
| |
| spin_lock_irqsave(&xhci->lock, flags); |
| for (i = LAST_EP_INDEX; i > 0; i--) { |
| --- a/drivers/usb/host/xhci-mem.c |
| +++ b/drivers/usb/host/xhci-mem.c |
| @@ -2636,7 +2636,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, |
| return 0; |
| |
| fail: |
| - xhci_warn(xhci, "Couldn't initialize memory\n"); |
| xhci_halt(xhci); |
| xhci_reset(xhci); |
| xhci_mem_cleanup(xhci); |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -1138,11 +1138,11 @@ static void xhci_handle_cmd_reset_ep(str |
| */ |
| if (xhci->quirks & XHCI_RESET_EP_QUIRK) { |
| struct xhci_command *command; |
| + |
| command = xhci_alloc_command(xhci, false, false, GFP_ATOMIC); |
| - if (!command) { |
| - xhci_warn(xhci, "WARN Cannot submit cfg ep: ENOMEM\n"); |
| + if (!command) |
| return; |
| - } |
| + |
| xhci_dbg_trace(xhci, trace_xhci_dbg_quirks, |
| "Queueing configure endpoint command"); |
| xhci_queue_configure_endpoint(xhci, command, |
| @@ -4018,10 +4018,8 @@ void xhci_queue_new_dequeue_state(struct |
| |
| /* This function gets called from contexts where it cannot sleep */ |
| cmd = xhci_alloc_command(xhci, false, false, GFP_ATOMIC); |
| - if (!cmd) { |
| - xhci_warn(xhci, "WARN Cannot submit Set TR Deq Ptr: ENOMEM\n"); |
| + if (!cmd) |
| return; |
| - } |
| |
| ep->queued_deq_seg = deq_state->new_deq_seg; |
| ep->queued_deq_ptr = deq_state->new_deq_ptr; |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -664,9 +664,11 @@ int xhci_run(struct usb_hcd *hcd) |
| |
| if (xhci->quirks & XHCI_NEC_HOST) { |
| struct xhci_command *command; |
| + |
| command = xhci_alloc_command(xhci, false, false, GFP_KERNEL); |
| if (!command) |
| return -ENOMEM; |
| + |
| xhci_queue_vendor_command(xhci, command, 0, 0, 0, |
| TRB_TYPE(TRB_NEC_GET_FW)); |
| } |
| @@ -3186,10 +3188,9 @@ static int xhci_alloc_streams(struct usb |
| } |
| |
| config_cmd = xhci_alloc_command(xhci, true, true, mem_flags); |
| - if (!config_cmd) { |
| - xhci_dbg(xhci, "Could not allocate xHCI command structure.\n"); |
| + if (!config_cmd) |
| return -ENOMEM; |
| - } |
| + |
| ctrl_ctx = xhci_get_input_control_ctx(config_cmd->in_ctx); |
| if (!ctrl_ctx) { |
| xhci_warn(xhci, "%s: Could not get input context, bad type.\n", |
| @@ -4795,11 +4796,11 @@ static int xhci_update_hub_device(struct |
| xhci_warn(xhci, "Cannot update hub desc for unknown device.\n"); |
| return -EINVAL; |
| } |
| + |
| config_cmd = xhci_alloc_command(xhci, true, true, mem_flags); |
| - if (!config_cmd) { |
| - xhci_dbg(xhci, "Could not allocate xHCI command structure.\n"); |
| + if (!config_cmd) |
| return -ENOMEM; |
| - } |
| + |
| ctrl_ctx = xhci_get_input_control_ctx(config_cmd->in_ctx); |
| if (!ctrl_ctx) { |
| xhci_warn(xhci, "%s: Could not get input context, bad type.\n", |