Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e0b564 authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

usb: xhci: remove error messages for failed memory allocation 



Omit extra messages for memory allocation failure.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3969384c

drivers/usb/host/xhci-hub.c

+1 −3
Original line number Diff line number Diff line
@@ -392,10 +392,8 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) 
	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--) {

drivers/usb/host/xhci-mem.c

+0 −1
Original line number Diff line number Diff line
@@ -2605,7 +2605,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 
	return 0;



fail:

	xhci_warn(xhci, "Couldn't initialize memory\n");

	xhci_halt(xhci);

	xhci_reset(xhci);

	xhci_mem_cleanup(xhci);

drivers/usb/host/xhci-ring.c

+4 −6
Original line number Diff line number Diff line
@@ -1135,11 +1135,11 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, 
	 */

	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,
@@ -4015,10 +4015,8 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci, 


	/* 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;

drivers/usb/host/xhci.c

+7 −6
Original line number Diff line number Diff line
@@ -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));

	}
@@ -3144,10 +3146,9 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev, 
	}



	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",
@@ -4753,11 +4754,11 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, 
		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",