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

Commit 14d49b7a authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: add helper to allocate command with input context 



Add a xhci_alloc_command_with_ctx() helper to get rid of
one of the boolean parameters telling if a context should
be allocated with the command.

No functional changes, improves core readability

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fd29937

drivers/usb/host/xhci-mem.c

+22 −2
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci, 


	/* Allocate everything needed to free the stream rings later */

	stream_info->free_streams_command =

		xhci_alloc_command(xhci, true, true, mem_flags);

		xhci_alloc_command_with_ctx(xhci, true, mem_flags);

	if (!stream_info->free_streams_command)

		goto cleanup_ctx;
@@ -1736,6 +1736,26 @@ struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci, 
	return command;

}



struct xhci_command *xhci_alloc_command_with_ctx(struct xhci_hcd *xhci,

		bool allocate_completion, gfp_t mem_flags)

{

	struct xhci_command *command;



	command = xhci_alloc_command(xhci, false, allocate_completion,

				     mem_flags);

	if (!command)

		return NULL;



	command->in_ctx = xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_INPUT,

						   mem_flags);

	if (!command->in_ctx) {

		kfree(command->completion);

		kfree(command);

		return NULL;

	}

	return command;

}



void xhci_urb_free_priv(struct urb_priv *urb_priv)

{

	kfree(urb_priv);
@@ -2409,7 +2429,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 
	xhci_write_64(xhci, val_64, &xhci->op_regs->cmd_ring);

	xhci_dbg_cmd_ptrs(xhci);



	xhci->lpm_command = xhci_alloc_command(xhci, true, true, flags);

	xhci->lpm_command = xhci_alloc_command_with_ctx(xhci, true, flags);

	if (!xhci->lpm_command)

		goto fail;

drivers/usb/host/xhci.c

+2 −2
Original line number Diff line number Diff line
@@ -3090,7 +3090,7 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev, 
		return -ENOSYS;

	}



	config_cmd = xhci_alloc_command(xhci, true, true, mem_flags);

	config_cmd = xhci_alloc_command_with_ctx(xhci, true, mem_flags);

	if (!config_cmd)

		return -ENOMEM;
@@ -4675,7 +4675,7 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, 
		return -EINVAL;

	}



	config_cmd = xhci_alloc_command(xhci, true, true, mem_flags);

	config_cmd = xhci_alloc_command_with_ctx(xhci, true, mem_flags);

	if (!config_cmd)

		return -ENOMEM;

drivers/usb/host/xhci.h

+2 −0
Original line number Diff line number Diff line
@@ -1994,6 +1994,8 @@ struct xhci_ring *xhci_stream_id_to_ring( 
struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,

		bool allocate_in_ctx, bool allocate_completion,

		gfp_t mem_flags);

struct xhci_command *xhci_alloc_command_with_ctx(struct xhci_hcd *xhci,

		bool allocate_completion, gfp_t mem_flags);

void xhci_urb_free_priv(struct urb_priv *urb_priv);

void xhci_free_command(struct xhci_hcd *xhci,

		struct xhci_command *command);